From aadb5a84593ce4092b6cf84af70da79cf96d0f0e Mon Sep 17 00:00:00 2001 From: yosiokat Date: Thu, 27 Mar 2008 13:00:02 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0=E3=83=A1?= =?UTF-8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E7=B3=BB=E3=82=A2=E3=83=97=E3=83=AA?= =?UTF-8?q?=E5=85=A8=E3=81=A6=E3=81=AE=E3=82=B2=E3=83=BC=E3=83=A0=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=82=92=E6=AD=A3=E5=BC=8F=E3=81=AA=E5=BD=A2?= =?UTF-8?q?=EF=BC=88=E3=81=9F=E3=81=B6=E3=82=93=EF=BC=89=E3=81=AB=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=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@989 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../sysmenu/ARM9/src/sysmenu_lib.c | 2 +- build/nandfirm/menu-launcher/ARM9/main.c | 2 +- .../systemMenu_RED/HWInfoWriter/ARM9/Makefile | 2 +- .../systemMenu_RED/HWInfoWriter/ARM9/main.rsf | 2 +- .../HWInfoWriter/ARM9/src/hwi.c | 12 ++++---- build/systemMenu_RED/Launcher/ARM9/Makefile | 4 +-- .../MachineSettings/ARM9/Makefile | 2 +- .../NandFormatter/ARM9.TWL/Makefile | 2 +- .../NandInitializer/ARM9.TWL/Makefile | 2 +- .../NandInitializer/ARM9.TWL/main.rsf | 2 +- .../ARM9.TWL/src/process_hw_info.c | 29 ------------------- .../NandInitializerAuto/ARM9.TWL/Makefile | 2 +- build/systemMenu_RED/PictoChat/ARM9/Makefile | 2 +- build/systemMenu_RED/wlanfirm/Makefile | 2 +- 14 files changed, 19 insertions(+), 48 deletions(-) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c index 5f63083f..c7f37972 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c @@ -422,7 +422,7 @@ static OSTitleId SYSMi_getTitleIdOfMachineSettings( void ) // 取得したタイトルに本体情報のIDがあるかチェック for( l = 0; l < getNum; l++ ) { char *code = ((char *)&pTitleIDList[l]) + 1; - if( 0 == STD_CompareNString( code, "ESM", 3 ) ) + if( 0 == STD_CompareNString( code, "SMH", 3 ) ) { ret = (OSTitleId)pTitleIDList[l]; break; diff --git a/build/nandfirm/menu-launcher/ARM9/main.c b/build/nandfirm/menu-launcher/ARM9/main.c index ffbdbd21..c22bfae2 100644 --- a/build/nandfirm/menu-launcher/ARM9/main.c +++ b/build/nandfirm/menu-launcher/ARM9/main.c @@ -40,7 +40,7 @@ static u8 acHeap[RSA_HEAP_SIZE] __attribute__ ((aligned (32))); static SVCSignHeapContext acPool; #define MENU_TITLE_ID_HI 0x00030017ULL -#define MENU_TITLE_ID_LO 0x4c4e4352ULL +#define MENU_TITLE_ID_LO 0x484c4e41ULL #define MENU_TITLE_ID (MENU_TITLE_ID_HI << 32 | MENU_TITLE_ID_LO) /* diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile index f1a5ddf9..bc21cbb2 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/Makefile @@ -30,7 +30,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED -TITLEID_LO = HIWR +TITLEID_LO = HHWA TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf b/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf index e8241ba0..f76afa30 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/main.rsf @@ -119,7 +119,7 @@ Property # # CardRegion: card region [Japan/America/Europe/Australia/China/Korea] # - CardRegion Japan + CardRegion ALL # # Codec mode: diff --git a/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c b/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c index 533b93f2..aa442b31 100644 --- a/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c +++ b/build/systemMenu_RED/HWInfoWriter/ARM9/src/hwi.c @@ -73,12 +73,12 @@ static char *strLanguage[] = { }; static const char *strLauncherGameCode[] = { - "LNCJ", - "LNCE", - "LNCP", - "LNCO", - "LNCC", - "LNCK", + "HLNJ", + "HLNE", + "HLNW", + "HLNU", + "HLNC", + "HLNK", }; //====================================================== diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index 8bc9789f..e0aa39f3 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -31,11 +31,11 @@ SUBDIRS = \ #FIRM_BUILD = TRUE TARGET_FIRM = SYSTEMMENU -TARGET_PLATFORM = TWL +TARGET_PLATFORM = TWL TWL_CODEGEN = ARM TWL_ARCHGEN = LIMITED -TITLEID_LO = LNCJ +TITLEID_LO = HLNJ TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile index 17575d5e..3bf51352 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile +++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile @@ -26,7 +26,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED -TITLEID_LO = MSET +TITLEID_LO = HMSJ TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl diff --git a/build/systemMenu_RED/NandFormatter/ARM9.TWL/Makefile b/build/systemMenu_RED/NandFormatter/ARM9.TWL/Makefile index c8ec756a..d23919d6 100644 --- a/build/systemMenu_RED/NandFormatter/ARM9.TWL/Makefile +++ b/build/systemMenu_RED/NandFormatter/ARM9.TWL/Makefile @@ -36,7 +36,7 @@ TWL_ARCHGEN = LIMITED #TWL_CODEGEN = THUMB -TITLEID_LO = FMTR +TITLEID_LO = 0NFA TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = NandFormatter.srl diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile b/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile index 5ab194db..4f3c48b1 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/Makefile @@ -32,7 +32,7 @@ TWL_ARCHGEN = LIMITED #TWL_CODEGEN = THUMB -TITLEID_LO = NINI +TITLEID_LO = 0NIA TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = NandInitializer.srl diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/main.rsf b/build/systemMenu_RED/NandInitializer/ARM9.TWL/main.rsf index 84cce6fe..21c0a4b3 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/main.rsf +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/main.rsf @@ -119,7 +119,7 @@ Property # # CardRegion: card region [Japan/America/Europe/Australia/China/Korea] # - CardRegion Japan + CardRegion ALL # # CommonClientKey: launcher deliver common client Key [TRUE/FALSE] 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 67377f70..263f878c 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 @@ -49,35 +49,6 @@ #define CURSOR_ORIGIN_X 32 #define CURSOR_ORIGIN_Y 56 -static char *strLanguage[] = { - (char *)"LANG_JAPANESE", - (char *)"LANG_ENGLISH", - (char *)"LANG_FRENCH", - (char *)"LANG_GERMAN", - (char *)"LANG_ITALIAN", - (char *)"LANG_SPANISH", - (char *)"LANG_CHINESE", - (char *)"LANG_KOREAN", -}; - -static const char *strRegion[] = { - "JAPAN", - "AMERICA", - "EUROPE", - "AUSTRALIA", - "CHINA", - "KOREA", -}; - -static const char *strLauncherGameCode[] = { - "LNCJ", - "LNCE", - "LNCP", - "LNCO", - "LNCC", - "LNCK", -}; - /*---------------------------------------------------------------------------* 内部変数定義 *---------------------------------------------------------------------------*/ diff --git a/build/systemMenu_RED/NandInitializerAuto/ARM9.TWL/Makefile b/build/systemMenu_RED/NandInitializerAuto/ARM9.TWL/Makefile index 411cfc41..33261142 100644 --- a/build/systemMenu_RED/NandInitializerAuto/ARM9.TWL/Makefile +++ b/build/systemMenu_RED/NandInitializerAuto/ARM9.TWL/Makefile @@ -36,7 +36,7 @@ TWL_ARCHGEN = LIMITED #TWL_CODEGEN = THUMB -TITLEID_LO = NINA +TITLEID_LO = 0NAA TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = NandInitializerAuto.srl diff --git a/build/systemMenu_RED/PictoChat/ARM9/Makefile b/build/systemMenu_RED/PictoChat/ARM9/Makefile index 330887e1..9b05d579 100644 --- a/build/systemMenu_RED/PictoChat/ARM9/Makefile +++ b/build/systemMenu_RED/PictoChat/ARM9/Makefile @@ -24,7 +24,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED -TITLEID_LO = PCHT +TITLEID_LO = HPCJ TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad TARGET_BIN = main.srl diff --git a/build/systemMenu_RED/wlanfirm/Makefile b/build/systemMenu_RED/wlanfirm/Makefile index 1838c9c5..6b82180e 100644 --- a/build/systemMenu_RED/wlanfirm/Makefile +++ b/build/systemMenu_RED/wlanfirm/Makefile @@ -28,7 +28,7 @@ MY_FIRM_ROOT = $(TWLWIRELESS_ROOT)/binfile MY_FIRM_ROOT_CYG = $(call eupath,$(MY_FIRM_ROOT)) -MY_TITLE = WLFW +MY_TITLE = HWFA MY_FIRM = $(MY_FIRM_ROOT_CYG)/nwm_firm.bin #----------------------------------------------------------------------------