From ac2127b101ffe37f5ddaff15eca1ccc9b3502fc8 Mon Sep 17 00:00:00 2001
From: aoki_ryoma <aoki_ryoma@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 4 Aug 2008 07:43:27 +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=E6=95=B0=E3=83=87=E3=83=BC=E3=82=BF=E3=81=8C=E5=8F=96?=
 =?UTF-8?q?=E5=BE=97=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=81=93=E3=81=A8?=
 =?UTF-8?q?=E3=81=8C=E3=81=82=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=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@2087 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../ARM9/src/get_wl.c                         | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/build/tests/DisplaySystemInformation/ARM9/src/get_wl.c b/build/tests/DisplaySystemInformation/ARM9/src/get_wl.c
index fb20a9f4..5f857801 100644
--- a/build/tests/DisplaySystemInformation/ARM9/src/get_wl.c
+++ b/build/tests/DisplaySystemInformation/ARM9/src/get_wl.c
@@ -7,19 +7,22 @@
 
 #define WL_TITLEID 0x0003000F484E4341
 
-#define WL_FW_VERSION_OFFSET	0xa0
-#define WL_FW_VERSION_SIZE		2
-#define WL_NUM_FW_OFFSET		0xa2
-#define WL_NUM_FW_SIZE			1
-#define WL_FW_TYPE_OFFSET		0xac
-#define WL_FW_TYPE_SIZE			4
+#define WL_FW_LOADSIZE			0x10
+#define WL_FW_LOAD_OFFSET		0xa0
+#define WL_FW_VERSION_LO_IDX	0x1
+#define WL_FW_VERSION_HI_IDX	0x0
+#define WL_FW_VERSION_SIZE		0x2
+#define WL_NUM_FW_IDX			0x2
+#define WL_NUM_FW_SIZE			0x2
+#define WL_FW_TYPE_IDX			0xc
+#define WL_FW_TYPE_SIZE			0x4
 
 
 void getWLInfo( void )
 {
 	FSFile file;
 	char filePath[NAM_PATH_LEN+1];
-	char filebuf[4];
+	char filebuf[WL_FW_LOADSIZE];
 	int res;
 
 	FS_InitFile( &file );	
@@ -28,6 +31,7 @@ void getWLInfo( void )
 	
 	if( FS_OpenFileEx( &file, filePath, FS_FILEMODE_R ) )
 	{
+		/*
 		// バージョン情報の読み取り
 		FS_SeekFile( &file, WL_FW_VERSION_OFFSET, FS_SEEK_SET );
 		res = FS_ReadFile( &file, filebuf, WL_FW_VERSION_SIZE );
@@ -57,6 +61,24 @@ void getWLInfo( void )
 			int value = (int) MI_LoadLE32( filebuf );
 			gAllInfo[MENU_WL][WL_FW_TYPE].iValue = value;
 			gAllInfo[MENU_WL][WL_FW_TYPE].str.sjis = s_strWLFWType[ value ];	
+		}*/
+		
+		FS_SeekFile( &file, WL_FW_LOAD_OFFSET , FS_SEEK_SET);
+		res = FS_ReadFile( &file, filebuf, WL_FW_LOADSIZE);
+		
+		if( res == WL_FW_LOADSIZE )
+		{
+			int value;
+			
+			snprintf( gAllInfo[MENU_WL][WL_VERSION].str.sjis, DISPINFO_BUFSIZE-1, "%d.%d",
+						 filebuf[WL_FW_VERSION_HI_IDX], filebuf[WL_FW_VERSION_LO_IDX] );
+						 
+			gAllInfo[MENU_WL][WL_NUM_FW].iValue = (int) MI_LoadLE8( &filebuf[WL_NUM_FW_IDX] );
+			gAllInfo[MENU_WL][WL_NUM_FW].isNumData = TRUE;
+			
+			value = (int) MI_LoadLE32( &filebuf[WL_FW_TYPE_IDX] );
+			gAllInfo[MENU_WL][WL_FW_TYPE].iValue = value;
+			gAllInfo[MENU_WL][WL_FW_TYPE].str.sjis = s_strWLFWType[ value ];	
 		}
 	}
 	else