From 436b0781c82c09497562589cf8bd9df44db24230 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 8 Feb 2008 02:35:27 +0000
Subject: [PATCH] =?UTF-8?q?(=E6=9B=B4=E6=96=B0:Akabane=20Jumpei)=20NTR?=
 =?UTF-8?q?=E3=81=AERomHeader=E3=83=90=E3=83=83=E3=83=95=E3=82=A1=E3=81=AE?=
 =?UTF-8?q?=E3=82=B2=E3=83=BC=E3=83=A0=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89?=
 =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E3=82=92=E4=B8=8A=E6=9B=B8=E3=81=8D=E3=81=97=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=81=9F=E9=83=A8=E5=88=86=E3=82=92=E4=BF=AE=E6=AD=A3?=
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@621 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h | 3 ++-
 build/libraries_sysmenu/sysmenu/ARM9/src/title.c        | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
index 8acf3306..5c2e3626 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
+++ b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
@@ -94,7 +94,8 @@ extern "C" {
 #define START_SHIFT                         31
 #define START_MASK                          0x80000000
 
-#define SCRAMBLE_MASK                       0x406000 // CS SE DSのマスク
+#define SCRAMBLE_MASK                       0x1840e000
+#define SECURE_COMMAND_SCRAMBLE_MASK		0x00406000 // CS SE DSのマスク
 
 #define AddLatency2ToLatency1(param)\
     ( (((param) &  LATENCY2_MASK)   \
diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
index 9bf0c6d0..0f0feab3 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
@@ -83,7 +83,11 @@ BOOL SYSM_GetCardTitleList( TitleProperty *pTitleList_Card )
 			SYSMi_GetWork()->flags.common.isCardStateChanged = FALSE;							// カード情報更新フラグを落とす
 			(void)OS_UnlockByWord( id, &SYSMi_GetWork()->lockCardRsc, NULL );					// ARM7と排他制御する
 			OS_ReleaseLockID( id );
-			
+
+		    // NTR-ROMヘッダバッファのゲームコマンドパラメータを上書きする
+            // [TODO:] この位置で問題ないか要確認
+    		*(vu32 *)(HW_ROM_HEADER_BUF + GAME_COMMAND_PARAM_INDEX) = SYSMi_GetWork()->gameCommondParam;
+            
 			pTitleList_Card->flags.isValid = TRUE;
 			pTitleList_Card->flags.isAppLoadCompleted = TRUE;
 			pTitleList_Card->flags.isAppRelocate = TRUE;
@@ -545,8 +549,6 @@ 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;
 }