From 6d1b22a372fe0cf84ce4e0dcbb2213c20b95b154 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 14 May 2008 04:49:48 +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=87=E3=83=BC=E3=82=BF?=
 =?UTF-8?q?=E3=82=92=E3=80=81=E3=83=90=E3=83=83=E3=83=95=E3=82=A1=E3=82=92?=
 =?UTF-8?q?=E4=BB=8B=E3=81=95=E3=81=9A=E3=81=AB=E7=9B=B4=E6=8E=A5RomHeader?=
 =?UTF-8?q?=E3=81=A7=E6=8C=87=E5=AE=9A=E3=81=95=E3=82=8C=E3=81=9F=E3=82=A2?=
 =?UTF-8?q?=E3=83=89=E3=83=AC=E3=82=B9=E3=81=AB=E8=BB=A2=E9=80=81=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=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@1336 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index e6a8abee..8a5af0fd 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -339,8 +339,8 @@ void HOTSW_Init(u32 threadPrio)
 
     // バッファの設定
     HOTSW_SetBootSegmentBuffer((void *)SYSM_CARD_ROM_HEADER_BAK, SYSM_CARD_ROM_HEADER_SIZE );
-    HOTSW_SetSecureSegmentBuffer(HOTSW_MODE1, (void *)SYSM_CARD_NTR_SECURE_BUF, SECURE_AREA_SIZE );
-    HOTSW_SetSecureSegmentBuffer(HOTSW_MODE2, (void *)SYSM_CARD_TWL_SECURE_BUF, SECURE_AREA_SIZE );
+//	HOTSW_SetSecureSegmentBuffer(HOTSW_MODE1, (void *)SYSM_CARD_NTR_SECURE_BUF, SECURE_AREA_SIZE );
+//	HOTSW_SetSecureSegmentBuffer(HOTSW_MODE2, (void *)SYSM_CARD_TWL_SECURE_BUF, SECURE_AREA_SIZE );
 
     // カードが挿さってあったらスレッドを起動する
     if(HOTSW_IsCardExist()){
@@ -516,6 +516,9 @@ static HotSwState LoadCardData(void)
             // ---------------------- Secure Mode ----------------------
             romMode = HOTSW_ROM_MODE_SECURE;
 
+            // Secure Segment の バッファ設定
+			HOTSW_SetSecureSegmentBuffer(HOTSW_MODE1, (void *)s_cbData.pBootSegBuf->rh.s.main_rom_offset, SECURE_AREA_SIZE );
+            
             // SecureモードのIDとSecureSegmentを読み込む
             state  = ReadSecureModeCardData();
             retval = (retval == HOTSW_SUCCESS) ? state : retval;
@@ -548,6 +551,9 @@ static HotSwState LoadCardData(void)
                 retval = (retval == HOTSW_SUCCESS) ? state : retval;
 
                 // ---------------------- Secure2 Mode ----------------------
+	            // Secure Segment の バッファ設定
+			    HOTSW_SetSecureSegmentBuffer(HOTSW_MODE2, (void *)s_cbData.pBootSegBuf->rh.s.main_ltd_rom_offset, SECURE_AREA_SIZE );
+                
                 // Secure2モードのIDとSecureSegmentを読み込む
                 state  = ReadSecureModeCardData();
                 retval = (retval == HOTSW_SUCCESS) ? state : retval;