From 5f6fa198767c097e4a3aaf7131c743063843a2bd Mon Sep 17 00:00:00 2001
From: sato_masaki <sato_masaki@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Sat, 19 Apr 2008 15:22:29 +0000
Subject: [PATCH] =?UTF-8?q?=E7=84=A1=E7=B7=9A=E3=83=95=E3=82=A1=E3=83=BC?=
 =?UTF-8?q?=E3=83=A0=E3=81=AE=E3=83=87=E3=83=BC=E3=82=BF=E3=82=BB=E3=82=B0?=
 =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4=E3=80=82?=
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@1191 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../Launcher/ARM9/src/loadWlanFirm.c          | 37 ++++---------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
index fbbab057..63e16f85 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
@@ -172,6 +172,8 @@ s32 ReadFirmwareHeader(char *path, u8 *buffer, s32 bufSize)
     FSFile  file[1];
     s32 flen;
 
+    FS_InitFile( file );
+    
     if (!FS_OpenFileEx(file, path, FS_FILEMODE_R)) {
         OS_TWarning("FS_OpenFileEx(%s) failed.\n", path);
         return -1;
@@ -198,6 +200,8 @@ s32 ReadFirmwareBinary(char *path, u32 offset, u8 *buffer, s32 bufSize)
     FSFile  file[1];
     s32 flen;
 
+    FS_InitFile( file );
+    
     if (!FS_OpenFileEx(file, path, FS_FILEMODE_R)) {
         OS_TWarning("FS_OpenFileEx(%s) failed.\n", path);
         return -1;
@@ -379,7 +383,6 @@ void PrintDigest(u8 *digest)
 BOOL InstallWlanFirmware( BOOL isHotStartWLFirm )
 {
     NWMRetCode err;
-    BOOL isColdStart;
 
 	s_isFinished = FALSE;
 	pNwmBuf = 0;
@@ -390,31 +393,8 @@ BOOL InstallWlanFirmware( BOOL isHotStartWLFirm )
     /* HotStart/ColdStartのチェック */
 	
 	s_isHotStartWLFirm = isHotStartWLFirm;
-	
-    if (TRUE == isHotStartWLFirm )
-    {
-        u8 fwType;
-        
-        isColdStart = FALSE;
-
-        // FWタイプが1のときのみData segmentの正当性をチェックする。
-
-        // [TODO:] TWL無線ドライバRC版のためのWorkaround
-        //         その後のドライバは、Data segmentが廃止される。
-        //         ドライバがバージョンアップされたら、この処理は削除する予定。
-        fwType = (u8)( ((NWMFirmDataSegment *)NWM_PARAM_FWDATA_ADDRESS)->fwType );
-        
-        // Check integrity of WLAN data segment
-        if (fwType == 1 && FALSE == NWMi_CheckFwDataIntegrity())
-        {
-            isColdStart = TRUE;
-        }
-
-    } else {
-        isColdStart = TRUE;
-    }
     
-    if (FALSE == isColdStart)  // HOT START
+    if (TRUE == isHotStartWLFirm)  // HOT START
     {
         pNwmBuf = SYSM_Alloc( NWM_SYSTEM_BUF_SIZE );
         if (!pNwmBuf) {
@@ -432,18 +412,17 @@ BOOL InstallWlanFirmware( BOOL isHotStartWLFirm )
     } else {    // COLD START
         s32 flen = 0;
         char path[256];
-        u32 offset, length;
+        u32 offset, length, fwType;
         u8 hdrBuffer[FWHEADER_SIZE];
         u8 *pHash = NULL;
-        u32 fwType;
 
-        // ColdStart
+        // Get Filepath
         if (FALSE == GetFirmwareFilepath(path)) {
             goto instfirm_error;
         }
 
         // Get WLAN Firmware type
-        fwType = ((NWMFirmDataSegment *)NWM_PARAM_FWDATA_ADDRESS)->fwType;
+        fwType = ((NWMFirmDataParam *)NWM_PARAM_FWDATA_ADDRESS)->fwType;
         OS_TPrintf("[Wlan Firm]  FWtype is %d\n", fwType);
 
         // Read header of WLAN firm