From 16569d2555a4fa7be34c9a3463130bed9e74e6cb Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 17 Jul 2008 02:42:25 +0000
Subject: [PATCH] =?UTF-8?q?VerInfo->VerData=E3=81=B8=E3=81=AE=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=81=AB=E5=AF=BE=E5=BF=9C=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/branches/20080717_SDK500ss4_branch@1929 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../MachineSettings/ARM9/src/getSysMenuVersion.c   | 14 +++++++-------
 .../MachineSettings/ARM9/src/getSysMenuVersion.h   |  2 +-
 .../systemMenu_RED/MachineSettings/ARM9/src/main.c |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/getSysMenuVersion.c b/build/systemMenu_RED/MachineSettings/ARM9/src/getSysMenuVersion.c
index ae06c983..ce351689 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/src/getSysMenuVersion.c
+++ b/build/systemMenu_RED/MachineSettings/ARM9/src/getSysMenuVersion.c
@@ -29,10 +29,10 @@
 
 
 // define data----------------------------------
-#define FS_VERSION_FILE					"verinfo:/version.bin"
-#define FS_EULA_URL_FILE				"verinfo:/eula_url.bin"
-#define FS_NUP_HOSTNAME_FILE			"verinfo:/nup_host.bin"
-#define FS_TIMESTAMP_FILE				"verinfo:/time_stamp.bin"
+#define FS_VERSION_FILE					"verdata:/version.bin"
+#define FS_EULA_URL_FILE				"verdata:/eula_url.bin"
+#define FS_NUP_HOSTNAME_FILE			"verdata:/nup_host.bin"
+#define FS_TIMESTAMP_FILE				"verdata:/time_stamp.bin"
 
 typedef struct SystemMenuVersion {
 	u16		major;
@@ -53,7 +53,7 @@ static u32 s_timestamp;
 
 
 // システムメニューバージョンのリード
-BOOL ReadSystemMenuVersionInfo( void *pWork, u32 workSize )
+BOOL ReadSystemMenuVersionData( void *pWork, u32 workSize )
 {
 	BOOL retval = TRUE;
 	
@@ -64,7 +64,7 @@ BOOL ReadSystemMenuVersionInfo( void *pWork, u32 workSize )
 	s_isRead = TRUE;
 	
 	// SystemMenuVersionのマウント（認証含む）
-	if( !NA_LoadVersionInfoArchive( pWork, workSize ) ) {
+	if( !NA_LoadVersionDataArchive( pWork, workSize ) ) {
 		return FALSE;
 	}
 	
@@ -148,7 +148,7 @@ BOOL ReadSystemMenuVersionInfo( void *pWork, u32 workSize )
     }
 	
 	// SystemMenuVersionのアンマウント
-	if( !NA_UnloadVersionInfoArchive() ) {
+	if( !NA_UnloadVersionDataArchive() ) {
 		return FALSE;
 	}
 	
diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/getSysMenuVersion.h b/build/systemMenu_RED/MachineSettings/ARM9/src/getSysMenuVersion.h
index 69f61fca..d9368a9f 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/src/getSysMenuVersion.h
+++ b/build/systemMenu_RED/MachineSettings/ARM9/src/getSysMenuVersion.h
@@ -32,7 +32,7 @@ extern "C" {
 #define TWL_NUP_HOSTNAME_LEN			64
 
 // システムメニューバージョン情報もろもろのリード
-extern BOOL ReadSystemMenuVersionInfo( void *pWork, u32 workSize );
+extern BOOL ReadSystemMenuVersionData( void *pWork, u32 workSize );
 
 
 // バージョン文字列の取得
diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/main.c b/build/systemMenu_RED/MachineSettings/ARM9/src/main.c
index cb64b13a..322a9b94 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/src/main.c
+++ b/build/systemMenu_RED/MachineSettings/ARM9/src/main.c
@@ -129,10 +129,10 @@ void TwlMain(void)
 	// SystemMenuバージョンetc.の読み込み
 	// ::::::::::::::::::::::::::::::::::::::::::::::
 	{
-        u8 *pBuffer = Alloc( NA_VERSION_INFO_WORK_SIZE );
+        u8 *pBuffer = Alloc( NA_VERSION_DATA_WORK_SIZE );
 		
         if( pBuffer &&
-			ReadSystemMenuVersionInfo( pBuffer, NA_VERSION_INFO_WORK_SIZE ) ) {
+			ReadSystemMenuVersionData( pBuffer, NA_VERSION_DATA_WORK_SIZE ) ) {
 			// リード成功
 		}else {
 			// FATALエラー