From da814e573eacd349a37eaf209b8f42b51b8ffe36 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 12 Jun 2008 08:50:58 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=AC=E9=80=9A?=
 =?UTF-8?q?=E5=B8=B8=E8=B5=B7=E5=8B=95=E6=99=82=E3=81=A8=E5=90=8C=E6=A7=98?=
 =?UTF-8?q?=E3=81=ABNAND=E3=82=A2=E3=83=97=E3=83=AA=E3=81=AETWL=E3=82=AB?=
 =?UTF-8?q?=E3=83=BC=E3=83=89NORMAL=E3=83=A2=E3=83=BC=E3=83=89=E8=B5=B7?=
 =?UTF-8?q?=E5=8B=95=E6=99=82=E3=82=82ROM=E3=83=98=E3=83=83=E3=83=80?=
 =?UTF-8?q?=E3=81=AE=E3=82=AB=E3=83=BC=E3=83=89=E3=82=B9=E3=82=AF=E3=83=A9?=
 =?UTF-8?q?=E3=83=B3=E3=83=96=E3=83=AB=E3=83=95=E3=83=A9=E3=82=B0=E3=82=92?=
 =?UTF-8?q?OFF=E3=81=AB=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@1621 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../libraries_sysmenu/hotsw/ARM7/src/hotsw.c  | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index eb385bf8..ee153c2b 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -92,6 +92,7 @@ static void ClearCardFlgs(void);
 
 static void FinalizeHotSw(HotSwApliType type);
 static void ForceNitroModeToFinalize(void);
+static void ForceNormalModeToFinalize(void);
 static BOOL ChangeGameMode(void);
 static void ClearCardIrq(void);
 static void ClearAllCardRegister(void);
@@ -1747,15 +1748,7 @@ static void FinalizeHotSw(HotSwApliType type)
             ForceNitroModeToFinalize();
         }
         else if(rh->s.access_control.game_card_on){
-            McPowerOn();
-
-            s_cbData.modeType = HOTSW_MODE2;
-            (void)LoadTable();
-            (void)ReadIDNormal(&s_cbData);
-            (void)ReadBootSegNormal(&s_cbData);
-            SYSMi_GetWork()->appCardID = s_cbData.id_nml;
-
-            OS_PutString("- game card on flg is TRUE : now Normal Mode\n");
+            ForceNormalModeToFinalize();
         }
         break;
 
@@ -1782,6 +1775,7 @@ final:
     }
 
     // 終了完了通知
+    SYSMi_GetWork()->gameCommondParam = s_cbData.gameCommondParam;
     SYSMi_GetWork()->flags.hotsw.isFinalized = TRUE;
 }
 
@@ -1806,6 +1800,27 @@ static void ForceNitroModeToFinalize(void)
 }
 
 
+/*---------------------------------------------------------------------------*
+  Name:        ForceNormalModeToFinalize
+
+  Description: Normal Modeに強制移行させる
+ *---------------------------------------------------------------------------*/
+static void ForceNormalModeToFinalize(void)
+{
+    McPowerOff();  // 既にOFFになっているため実質的には無効
+    McPowerOn();
+
+    s_cbData.modeType = HOTSW_MODE2;
+    (void)LoadTable();
+    (void)ReadIDNormal(&s_cbData);
+    (void)ReadBootSegNormal(&s_cbData);
+    s_cbData.gameCommondParam = s_cbData.pBootSegBuf->rh.s.game_cmd_param & ~SCRAMBLE_MASK;
+    SYSMi_GetWork()->appCardID = s_cbData.id_nml;
+
+    OS_PutString("- game card on flg is TRUE : now Normal Mode\n");
+}
+
+
 /*---------------------------------------------------------------------------*
   Name:        ChangeGameMode