From 4bffe316c8e149c07f6cde6f2b555495b7e329d4 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 22 Aug 2008 09:25:28 +0000
Subject: [PATCH] =?UTF-8?q?NVRAM=E3=81=8B=E3=82=89=E3=81=AEfwType=E8=AA=AD?=
 =?UTF-8?q?=E3=81=BF=E8=BE=BC=E3=81=BF=E3=82=92=E6=88=90=E5=8A=9F=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=81=BE=E3=81=A7=E3=83=AA=E3=83=88=E3=83=A9=E3=82=A4?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E5=A4=89=E6=9B=B4=E3=80=82?=
 =?UTF-8?q?=20(SPI=E6=8E=92=E4=BB=96=E5=87=A6=E7=90=86=E3=81=AB=E3=82=88?=
 =?UTF-8?q?=E3=82=8B=E8=AA=AD=E3=81=BF=E3=83=9F=E3=82=B9=E5=AF=BE=E7=AD=96?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2240 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
index 84b87b82..bb77e5c9 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
@@ -374,7 +374,6 @@ BOOL InstallWlanFirmware( BOOL isHotStartWLFirm )
 {
     NWMRetCode err;
     NWMFirmDataParam *pFdParam = (NWMFirmDataParam *)NWM_PARAM_FWDATA_ADDRESS;
-    NVRAMResult nvRes;
     u8 *pSecBuf = NULL;
     u8 *pHdrBuf = NULL;
 
@@ -398,13 +397,10 @@ BOOL InstallWlanFirmware( BOOL isHotStartWLFirm )
 
     OS_InitMessageQueue(&mesq, mesAry, sizeof(mesAry)/sizeof(mesAry[0]));
 
-    /* Read FW type from NVRAM */
-    nvRes = NVRAMi_Read(NWM_NVR_FWTYPE_OFFSET_ADDRESS, 1, &fwType );
-
-    if (nvRes != NVRAM_RESULT_SUCCESS)
+    /* Read FW type from NVRAM (retry till success) */
+    while (NVRAM_RESULT_SUCCESS != NVRAMi_Read(NWM_NVR_FWTYPE_OFFSET_ADDRESS, sizeof(fwType), &fwType ))
     {
-        OS_TWarning("Error: Couldn't access NVRAM.\n");
-        goto instfirm_error;
+        OS_SpinWait( 256 );
     }
 
     if (fwType == 0xFF)