From 3d48028d316984b152c9988fa68e38726ee45fb1 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 14 Aug 2008 11:34:30 +0000
Subject: [PATCH] =?UTF-8?q?=E8=A3=BD=E5=93=81=E3=83=93=E3=83=AB=E3=83=89?=
 =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC=EF=BC=86=E3=83=87?=
 =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=AC=E4=B8=8A=E3=81=A7=E3=81=AE=E8=B5=B7?=
 =?UTF-8?q?=E5=8B=95=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@2160 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../NandInitializerRed/ARM9.TWL/src/main.c             | 10 ++++++++++
 .../systemMenu_tools/SystemUpdater/ARM9.TWL/src/main.c | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/main.c b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/main.c
index dcce44f7..d3e3b270 100644
--- a/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/main.c
+++ b/build/systemMenu_tools/NandInitializerRed/ARM9.TWL/src/main.c
@@ -20,6 +20,7 @@
 #include <twl/fatfs.h>
 #include <nitro/card.h>
 #include <twl/nam.h>
+#include <twl/os/common/format_rom.h>
 #include <sysmenu/namut.h>
 #include "kami_font.h"
 #include "process_format.h"
@@ -31,6 +32,8 @@
 #include "process_fade.h"
 #include "hwi.h"
 
+#define SCRAMBLE_MASK 0x00406000
+
 extern void HWInfoWriterInit( void );
 
 /*---------------------------------------------------------------------------*
@@ -58,6 +61,13 @@ static void InitAllocation(void);
 void 
 TwlMain()
 {
+    // 製品ビルドランチャー＆デバッガ上での起動対応
+    if ( OS_GetRunningConsoleType() & OS_CONSOLE_TWLDEBUGGER )
+    {
+        ROM_Header *dh = (void *)HW_ROM_HEADER_BUF;
+        dh->s.game_cmd_param &= ~SCRAMBLE_MASK;
+    }
+
     OS_Init();
 	OS_InitTick();
     OS_InitArena();
diff --git a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/src/main.c b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/src/main.c
index adcf9d45..ad5fedec 100644
--- a/build/systemMenu_tools/SystemUpdater/ARM9.TWL/src/main.c
+++ b/build/systemMenu_tools/SystemUpdater/ARM9.TWL/src/main.c
@@ -19,6 +19,7 @@
 #include <twl.h>
 #include <nitro/snd.h>
 #include <twl/fatfs.h>
+#include <twl/os/common/format_rom.h>
 #include <sysmenu/namut.h>
 #include <twl/nam.h>
 #include "kami_pxi.h"
@@ -33,6 +34,8 @@
 #include "debugger_hw_reset_control.h"
 #include "debugger_card_rom.h"
 
+#define SCRAMBLE_MASK 0x00406000
+
 extern const char *g_strIPLSvnRevision;
 extern const char *g_strSDKSvnRevision;
 
@@ -121,6 +124,13 @@ TwlMain()
 	int tadNum;
 	int i,j;
 
+    // 製品ビルドランチャー＆デバッガ上での起動対応
+    if ( OS_GetRunningConsoleType() & OS_CONSOLE_TWLDEBUGGER )
+    {
+        ROM_Header *dh = (void *)HW_ROM_HEADER_BUF;
+        dh->s.game_cmd_param &= ~SCRAMBLE_MASK;
+    }
+
     OS_Init();
 	OS_InitThread();
 	OS_InitTick();