From 10b505b4b17482b42309ebc11e549a89ef3e55fc Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 12 Feb 2008 05:26:25 +0000
Subject: [PATCH] =?UTF-8?q?ROM=E3=83=98=E3=83=83=E3=83=80=E3=81=AE?=
 =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=AC=E5=AF=BE=E5=BF=9C=EF=BC=88?=
 =?UTF-8?q?=E3=82=B9=E3=82=AF=E3=83=A9=E3=83=B3=E3=83=96=E3=83=AB=E8=A7=A3?=
 =?UTF-8?q?=E9=99=A4=EF=BC=89=E3=82=92bootAPI=E3=81=B8=E7=A7=BB=E5=8B=95?=
 =?UTF-8?q?=E3=80=82=20bootAPI=E3=81=A7=E3=81=AEROM=E3=83=98=E3=83=83?=
 =?UTF-8?q?=E3=83=80=E3=82=B3=E3=83=94=E3=83=BC=E3=82=92=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=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@630 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/boot/ARM7/src/bootAPI.c  |  2 +-
 build/libraries_sysmenu/boot/ARM9/src/bootAPI.c  | 11 ++++++-----
 build/libraries_sysmenu/sysmenu/ARM9/src/title.c |  5 -----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
index bdc028a6..d183eeb0 100644
--- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
@@ -211,7 +211,7 @@ BOOL BOOT_WaitStart( void )
                 OS_Terminate();
             }
 #endif // FIRM_USE_SDK_KEYS || SYSMENU_DISABLE_RETAIL_BOOT
-			
+
 			// リブート
 			OS_Boot( dh->s.sub_entry_address, mem_list, target );
 		}
diff --git a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
index 8779cfb1..9e58253e 100644
--- a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
@@ -92,10 +92,7 @@ void BOOT_Ready( void )
         reg_GX_VRAMCNT_D    = pWRAMREGS->main_vrambnk_d;
         reg_GX_VRAMCNT_WRAM = pWRAMREGS->main_wrambnk_01;
     }
-	
-	// ROMヘッダバッファをコピー
-	MI_CpuCopy32( (void *)HW_TWL_ROM_HEADER_BUF, (void *)HW_ROM_HEADER_BUF, HW_ROM_HEADER_BUF_END - HW_ROM_HEADER_BUF );
-	
+
     // SDK共通リブート
 	{
 	    // メモリリストの設定
@@ -148,7 +145,11 @@ void BOOT_Ready( void )
             OS_Terminate();
         }
 #endif // FIRM_USE_SDK_KEYS || SYSMENU_DISABLE_RETAIL_BOOT
-		
+
+        // デバッガによるROMエミュレーション時はNTR-ROMヘッダバッファの
+        // ゲームコマンドパラメータをスクランブルOFF設定に書き換える
+        dh->s.game_cmd_param = SYSMi_GetWork()->gameCommondParam;
+
 		// 起動するターゲットの種類を指定する必要あり
 		OS_Boot( dh->s.main_entry_address, mem_list, target );
 	}
diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
index 0f0feab3..7d725c1c 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
@@ -22,7 +22,6 @@
 
 // define data-----------------------------------------------------------------
 #define CARD_BANNER_INDEX			( LAUNCHER_TITLE_LIST_NUM - 1 )
-#define GAME_COMMAND_PARAM_INDEX	0x60
 
 // extern data-----------------------------------------------------------------
 // function's prototype-------------------------------------------------------
@@ -84,10 +83,6 @@ BOOL SYSM_GetCardTitleList( TitleProperty *pTitleList_Card )
 			(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;