From 883ca102ac3d7fa06ab888760b8350ce9aa316a0 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 14 May 2008 05:36:06 +0000
Subject: [PATCH] =?UTF-8?q?(=E6=9B=B4=E6=96=B0:Akabane=20Jumpei)=20?=
 =?UTF-8?q?=E3=83=BBSecure=20Segment=E3=81=AE=E3=83=AD=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E5=85=88=E9=83=A8=E5=88=86=E3=82=92=E5=B0=91=E3=81=97=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20=E3=83=BBWRAM=E7=B5=8C=E7=94=B1=E3=82=AB=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=82=A2=E3=83=97=E3=83=AA=E3=83=AD=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E9=96=A2=E4=BF=82=E3=81=A7=E3=80=81=E3=83=90=E3=83=8A=E3=83=BC?=
 =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E8=AA=AD=E3=81=BF=E8=BE=BC?=
 =?UTF-8?q?=E3=81=BF=E3=83=BB=E8=AA=8D=E8=A8=BC=E3=82=B3=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BF=E3=81=AFARM7=E3=81=A7?=
 =?UTF-8?q?=E3=82=AA=E3=83=BC=E3=83=88=E3=81=A7=E3=82=84=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=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@1337 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index 8a5af0fd..e0d7d709 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -391,8 +391,8 @@ static HotSwState LoadCardData(void)
 
     // バッファを設定
     s_cbData.pBootSegBuf   = s_pBootSegBuffer;
-    s_cbData.pSecureSegBuf = s_pSecureSegBuffer;
-    s_cbData.pSecure2SegBuf= s_pSecure2SegBuffer;
+//	s_cbData.pSecureSegBuf = s_pSecureSegBuffer;
+//	s_cbData.pSecure2SegBuf= s_pSecure2SegBuffer;
 
     // ロード処理開始
     if(HOTSW_IsCardAccessible()){
@@ -570,10 +570,6 @@ static HotSwState LoadCardData(void)
             state  = ReadIDGame(&s_cbData);
             retval = (retval == HOTSW_SUCCESS) ? state : retval;
 
-#ifdef USE_WRAM_LOAD
-            // 排他制御ここまで(※CRCチェックまでにミスがなかったら、排他制御ここまで)
-            UnlockHotSwRsc(&SYSMi_GetWork()->lockCardRsc);
-#else
             // バナーファイルの読み込み
             state  = LoadBannerData();
             retval = (retval == HOTSW_SUCCESS) ? state : retval;
@@ -587,16 +583,17 @@ static HotSwState LoadCardData(void)
                 goto finalize;
             }
 
+            // 認証コード読み込み＆ワーク領域にコピー
+            state  = CheckCardAuthCode();
+            retval = (retval == HOTSW_SUCCESS) ? state : retval;
+
+#ifndef USE_WRAM_LOAD
             // 常駐モジュール残りを指定先に転送
             state  = LoadStaticModule();
             retval = (retval == HOTSW_SUCCESS) ? state : retval;
 
             // ARM9常駐モジュールの先頭2KBの暗号化領域を複合化
             (void)DecryptObjectFile();
-
-            // 認証コード読み込み＆ワーク領域にコピー
-            state  = CheckCardAuthCode();
-            retval = (retval == HOTSW_SUCCESS) ? state : retval;
 #endif
         }
         else{