From 583f2e98dfff3112e511d789a0346e496e6fb894 Mon Sep 17 00:00:00 2001 From: kamikawa Date: Tue, 18 Mar 2008 08:52:22 +0000 Subject: [PATCH] =?UTF-8?q?LCFG=5FTWL=5FREGION=5F**=20=E3=81=8B=E3=82=89?= =?UTF-8?q?=20OS=5FTWL=5FREGION=5F**=20=E3=81=B8=E3=81=AE=E5=AE=9A?= =?UTF-8?q?=E7=BE=A9=E5=A4=89=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/trunk@897 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c | 4 ++-- .../NandInitializer/ARM9.TWL/src/process_hw_info.c | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c b/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c index e676439d..a117d63d 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c @@ -51,7 +51,7 @@ static void (*spFree)( void *ptr ); // const data ----------------------------------------- -static const u32 s_langBitmapList[ LCFG_TWL_REGION_MAX ] = { +static const u32 s_langBitmapList[ OS_TWL_REGION_MAX ] = { LCFG_TWL_LANG_BITMAP_JAPAN, LCFG_TWL_LANG_BITMAP_AMERICA, LCFG_TWL_LANG_BITMAP_EUROPE, @@ -351,7 +351,7 @@ BOOL HWI_WriteHWSecureInfoFile( u8 region, const u8 *pSerialNo, BOOL isDisableWi u8 buffer[ 12 ] = "SERIAL"; // 適当な文字列をMACアドレスと結合してSHA1を取り、仮SerialNoとする。 u8 serialNo[ SVC_SHA1_DIGEST_SIZE ]; int i; - int len = ( LCFG_THW_GetRegion() == LCFG_TWL_REGION_AMERICA ) ? + int len = ( LCFG_THW_GetRegion() == OS_TWL_REGION_AMERICA ) ? LCFG_TWL_HWINFO_SERIALNO_LEN_AMERICA : LCFG_TWL_HWINFO_SERIALNO_LEN_OTHERS; OS_GetMacAddress( buffer + 6 ); SVC_CalcSHA1( serialNo, buffer, sizeof(buffer) ); diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_hw_info.c b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_hw_info.c index d01a1be1..6f549aad 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_hw_info.c +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_hw_info.c @@ -48,15 +48,6 @@ #define CURSOR_ORIGIN_X 32 #define CURSOR_ORIGIN_Y 56 -static const u32 s_langBitmapList[ LCFG_TWL_REGION_MAX ] = { - LCFG_TWL_LANG_BITMAP_JAPAN, - LCFG_TWL_LANG_BITMAP_AMERICA, - LCFG_TWL_LANG_BITMAP_EUROPE, - LCFG_TWL_LANG_BITMAP_AUSTRALIA, - LCFG_TWL_LANG_BITMAP_CHINA, - LCFG_TWL_LANG_BITMAP_KOREA, -}; - static char *strLanguage[] = { (char *)"LANG_JAPANESE", (char *)"LANG_ENGLISH",