From 3eea43f9486d3f623ec1bfe7948c4a95e05eff75 Mon Sep 17 00:00:00 2001 From: kamikawa Date: Thu, 28 Aug 2008 07:22:03 +0000 Subject: [PATCH] =?UTF-8?q?SystemUpdater=E5=8F=8A=E3=81=B3NandInitializer*?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=99=82=E3=81=AB=E6=97=A2=E5=AD=98=E3=81=AE?= =?UTF-8?q?=E3=82=B7=E3=83=AA=E3=82=A2=E3=83=ABNo=E3=81=AE=E5=85=88?= =?UTF-8?q?=E9=A0=AD=E3=81=8C'T'=E3=81=A7=E3=81=82=E3=82=8C=E3=81=B0?= =?UTF-8?q?=E6=95=B0=E5=AD=97=EF=BC=98=E6=A1=81=E9=83=A8=E5=88=86=E3=82=92?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E4=BF=AE=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@2307 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../systemMenu_tools/HWInfoWriter/ARM9/src/HWInfoWriter.c | 8 ++++---- build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/systemMenu_tools/HWInfoWriter/ARM9/src/HWInfoWriter.c b/build/systemMenu_tools/HWInfoWriter/ARM9/src/HWInfoWriter.c index 3cb0895b..a6dbafec 100644 --- a/build/systemMenu_tools/HWInfoWriter/ARM9/src/HWInfoWriter.c +++ b/build/systemMenu_tools/HWInfoWriter/ARM9/src/HWInfoWriter.c @@ -128,11 +128,11 @@ void HWInfoWriterInit( void ) } // 無線強制ON/OFF情報の表示 - s_isDisableWireless = LCFG_THW_IsForceDisableWireless(); + s_isDisableWireless = OS_IsForceDisableWireless(); PrintfSJIS( 3 * 8, 2 * 8, TXT_COLOR_BLACK, pWireless[ s_isDisableWireless ] ); - OS_TPrintf( "region = %d\n", LCFG_THW_GetRegion() ); - PrintfSJISSub( 2 * 8, 16 * 8, TXT_COLOR_BLACK, "Region = %s", strRegion[ LCFG_THW_GetRegion() ] ); + OS_TPrintf( "region = %d\n", OS_GetRegion() ); + PrintfSJISSub( 2 * 8, 16 * 8, TXT_COLOR_BLACK, "Region = %s", strRegion[ OS_GetRegion() ] ); PrintfSJISSub( 2 * 8, 18 * 8, TXT_COLOR_BLACK, "SerialNo = %s", LCFG_THW_GetSerialNoPtr() ); if ( 1 ) { @@ -143,7 +143,7 @@ void HWInfoWriterInit( void ) for( i = 0; i < 4; i++ ) gameCode[ i ] = titleID_Lo[ 4 - i - 1 ]; PrintfSJISSub( 2 * 8, 20 * 8, TXT_COLOR_BLACK, "LauncherTitleID_Lo = %s", gameCode ); } - s_region_old = LCFG_THW_GetRegion(); + s_region_old = OS_GetRegion(); s_csr = 0; DrawMenu( s_csr, &s_writerParam ); diff --git a/build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c b/build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c index 19d85897..fd24bbd5 100644 --- a/build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c +++ b/build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c @@ -384,7 +384,7 @@ BOOL HWI_WriteHWNormalInfoFile( void ) u8 serialNo[ LCFG_TWL_HWINFO_MOVABLE_UNIQUE_ID_LEN ]; MI_CpuClear8( serialNo, LCFG_TWL_HWINFO_MOVABLE_UNIQUE_ID_LEN ); - LCFG_THW_GetSerialNo( serialNo ); + OS_GetSerialNo( serialNo ); for( i = 0; i < LCFG_TWL_HWINFO_MOVABLE_UNIQUE_ID_LEN; i++ ) { Info.movableUniqueID[ i ] = (u8)( serialNo[ i ] ^ s_serialNo_mask[ i ] ); @@ -432,7 +432,7 @@ BOOL HWI_WriteHWSecureInfoFile( u8 region, const u8 *pSerialNo, BOOL isDisableWi LCFG_THW_SetFlagForceDisableWireless( isDisableWireless ); // 旧リージョンを保存 - old_region = LCFG_THW_GetRegion(); + old_region = OS_GetRegion(); // リージョンのセット LCFG_THW_SetRegion( region ); @@ -463,7 +463,7 @@ BOOL HWI_WriteHWSecureInfoFile( u8 region, const u8 *pSerialNo, BOOL isDisableWi } // 現在のシリアルNo取得 - LCFG_THW_GetSerialNo( serialNoOld ); + OS_GetSerialNo( serialNoOld ); // 新しいシリアルNoをクリアしておく MI_CpuClear8( serialNoNew, sizeof(serialNoNew) );