From 8755e60c6a686031820c6d0b7198834b1448a082 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 14 Feb 2008 08:17:02 +0000
Subject: [PATCH] git-svn-id:
 file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@658
 b08762b0-b915-fc4b-9d8c-17b2551a87ff

---
 .../Launcher/ARM9/src/loadWlanFirm.c          | 38 ++++++++++++++++---
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
index 78e3eece..51bac4fc 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
@@ -17,8 +17,13 @@
 #include <twl.h>
 #include <twl/nam.h>
 #include <twl/os/common/format_rom.h>
+#include <twl/lcfg.h>
+
 #include "loadWlanFirm.h"
 
+/* LCFGの無線ファームバージョンをタイトルＩＤとしてそのまま使う場合 */
+#define USE_LCFG_STRING 0
+
 
 static int   isNwmActive;
 static u32   nwmBuf[NWM_SYSTEM_BUF_SIZE/sizeof(u32)] ATTRIBUTE_ALIGN(32);
@@ -56,21 +61,42 @@ BOOL WirelessFirmwareDownloadStart(void)
   char path[256];
   FSFile  file[1];
 
-  char *title = "WFW0";
+  u8 title[4];
 
+#if( USE_LCFG_STRING == 0 )
+  char *title0 = "WFW0";
+  char *title1 = "WFW1";
+#endif
   u32 titleID_hi;
   u32 titleID_lo;
-
   u64 titleID = 0;
   s32 flen = 0;
   NWMRetCode err;
+  int i;
+
+
+  LCFG_THW_GetWirelessFirmTitleID_Lo( title );
+
+#if( USE_LCFG_STRING == 0 )
+  if( title[0] == 0 ) {
+    for( i = 0 ; i < 4 ; i++ ) {
+      title[i] = (u8)*title0++;
+    }
+  }
+  else {
+    for( i = 0 ; i < 4 ; i++ ) {
+      title[i] = (u8)*title1++;
+    }
+  }
+#endif
+
 
   titleID_hi = (( 3 /* Nintendo */ << 16) | 4 /* */ | 1 /* */);
 
-  titleID_lo =  ((u32)( *title++ ) & 0xff) << 24;
-  titleID_lo |= ((u32)( *title++ )& 0xff) << 16;
-  titleID_lo |= ((u32)( *title++ )& 0xff) << 8;
-  titleID_lo |= (u32)( *title++ ) & 0xff;
+  titleID_lo =  ((u32)( title[0] ) & 0xff) << 24;
+  titleID_lo |= ((u32)( title[1] )& 0xff) << 16;
+  titleID_lo |= ((u32)( title[2] )& 0xff) << 8;
+  titleID_lo |= (u32)( title[3] ) & 0xff;
 
   titleID = ((u64)(titleID_hi) << 32)  | (u64)titleID_lo;