From d3ce60c97ec51a7c28d2b5a64712d6a5a223d844 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff> Date: Tue, 29 Jan 2008 05:31:15 +0000 Subject: [PATCH] =?UTF-8?q?(=E6=9B=B4=E6=96=B0:Akabane=20Jumpei)=20?= =?UTF-8?q?=E3=82=A8=E3=83=9F=E3=83=A5=E3=83=AC=E3=83=BC=E3=82=BF=E3=82=92?= =?UTF-8?q?=E8=AA=AD=E3=82=93=E3=81=A0=E5=A0=B4=E5=90=88=E3=80=81=E3=82=B2?= =?UTF-8?q?=E3=83=BC=E3=83=A0=E3=83=A2=E3=83=BC=E3=83=89=E3=81=A7=E3=82=B9?= =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=83=B3=E3=83=96=E3=83=AB=E3=82=92=E3=81=8B?= =?UTF-8?q?=E3=81=91=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=80=81?= =?UTF-8?q?=20NTR=E3=81=AERomHeader=E3=83=90=E3=83=83=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=81=AE=E3=82=B2=E3=83=BC=E3=83=A0=E3=82=B3=E3=83=9E=E3=83=B3?= =?UTF-8?q?=E3=83=89=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E9=83=A8?= =?UTF-8?q?=E5=88=86=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82=20(SlotB=E3=81=A7?= =?UTF-8?q?=E3=82=A8=E3=83=9F=E3=83=A5=E3=83=AC=E3=83=BC=E3=82=BF=E3=82=92?= =?UTF-8?q?=E8=AA=AD=E3=82=93=E3=81=A0=E5=A0=B4=E5=90=88=E3=81=AE=E3=81=BF?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C)?= 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@534 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h | 4 ++-- build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 4 ++++ build/libraries_sysmenu/sysmenu/ARM9/src/title.c | 3 +++ include/sysmenu/sysmenu_lib/common/sysmenu_work.h | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h index 931e6389..f392d335 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h +++ b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h @@ -23,7 +23,7 @@ extern "C" { // Define ------------------------------------------------------------------- -#define HOTSW_NO_MESSAGE // Printf抑制スイッチ +//#define HOTSW_NO_MESSAGE // Printf抑制スイッチ #ifdef HOTSW_NO_MESSAGE #ifndef SDK_FINALROM @@ -94,7 +94,7 @@ extern "C" { #define START_SHIFT 31 #define START_MASK 0x80000000 -#define SCRAMBLE_MASK 0x00406000 +#define SCRAMBLE_MASK 0x1840e000 #define AddLatency2ToLatency1(param)\ ( (((param) & LATENCY2_MASK) \ diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c index 5fa3e05c..9cbd8d22 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c @@ -281,6 +281,10 @@ BOOL HOTSW_Boot(void) OS_TPrintf("Rom Emulation Data : 0x%04x\n",s_cbData.romEmuBuf[0]); if(s_cbData.debuggerFlg){ s_cbData.cardType = ROM_EMULATION; + SYSMi_GetWork()->gameCommondParam = s_cbData.pBootSegBuf->rh.s.game_cmd_param & ~SCRAMBLE_MASK; + } + else{ + SYSMi_GetWork()->gameCommondParam = s_cbData.pBootSegBuf->rh.s.game_cmd_param; } // ROMヘッダCRCを算出してチェック。NintendoロゴCRCも確認。 diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c index 1bbb4724..1f137c2a 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c @@ -22,6 +22,7 @@ // define data----------------------------------------------------------------- #define CARD_BANNER_INDEX ( LAUNCHER_TITLE_LIST_NUM - 1 ) +#define GAME_COMMAND_PARAM_INDEX 0x60 // extern data----------------------------------------------------------------- // function's prototype------------------------------------------------------- @@ -509,6 +510,8 @@ static void SYSMi_Relocate( void ) MI_CpuCopyFast( (void *)SYSM_CARD_ROM_HEADER_BUF, (void *)HW_TWL_ROM_HEADER_BUF, HW_ROM_HEADER_BUF_END - HW_ROM_HEADER_BUF ); MI_CpuCopyFast( (void *)SYSM_CARD_ROM_HEADER_BUF, (void *)HW_ROM_HEADER_BUF, HW_ROM_HEADER_BUF_END - HW_ROM_HEADER_BUF ); } + // NTR-ROMヘッダバッファのゲームコマンドパラメータを上書きする + *(vu32 *)(HW_ROM_HEADER_BUF + GAME_COMMAND_PARAM_INDEX) = SYSMi_GetWork()->gameCommondParam; } diff --git a/include/sysmenu/sysmenu_lib/common/sysmenu_work.h b/include/sysmenu/sysmenu_lib/common/sysmenu_work.h index a6aaf7ea..5cb08fc2 100644 --- a/include/sysmenu/sysmenu_lib/common/sysmenu_work.h +++ b/include/sysmenu/sysmenu_lib/common/sysmenu_work.h @@ -97,7 +97,8 @@ typedef struct SYSM_work { OSLockWord lockCardRsc; // カードリソース排他制御用 int cloneBootMode; u32 nCardID; // カードID - + u32 gameCommondParam; // NTRのゲームコマンドパラメータ(NTRのROMヘッダのゲームコマンドパラメータに上書きする) + LauncherParam launcherParam; ISD_RomEmuInfo romEmuInfo;