From e58eec78fd17ec593d082fac2b526f49094035b9 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 12 Mar 2008 11:51:20 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=83=83=E3=82=AF=E3=81=8C?=
 =?UTF-8?q?=E7=B5=90=E6=A7=8B=E3=82=AE=E3=83=AA=E3=82=AE=E3=83=AA=E3=81=AB?=
 =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B=E3=81=AE=E3=81=A7?=
 =?UTF-8?q?=E5=A2=97=E3=82=84=E3=81=97=E3=81=A6=E3=81=8A=E3=81=8F=E3=80=82?=
 =?UTF-8?q?=20=E5=B0=86=E6=9D=A5=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AE?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=BF=98=E3=82=8C=E7=AD=89=E3=81=8C=E7=99=BA?=
 =?UTF-8?q?=E7=94=9F=E3=81=97=E3=81=AB=E3=81=8F=E3=81=84=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AB=E4=B8=80=E8=B2=AB?=
 =?UTF-8?q?=E6=80=A7=E3=82=92=E6=8C=81=E3=81=9F=E3=81=9B=E3=82=8B=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@874 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h | 2 +-
 build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c          | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
index a502516c..09420636 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
+++ b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
@@ -52,7 +52,7 @@ extern "C" {
 #define PNB_L_VALUE                         0x879b9b05  //
 #define PNB_H_VALUE                         0x5c        //
 
-#define	HOTSW_THREAD_STACK_SIZE				(1024 + PAGE_SIZE)	// スタックサイズ
+#define	HOTSW_THREAD_STACK_SIZE				(1024 * 2)			// スタックサイズ
 #define	HOTSW_DMA_MSG_NUM					8					// DMA転送終了割り込み
 #define	HOTSW_INSERT_MSG_NUM				16					// 挿し割り込み送信メッセージの数
 #define	HOTSW_PULLED_MSG_NUM				16					// 抜け割り込み送信メッセージの数
diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index 81397c74..4a664563 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -604,9 +604,10 @@ static HotSwState LoadStaticModule(void)
 	// 配置先と再配置情報を取得 & Arm9の常駐モジュール残りを指定先に転送
     if(SYSM_CheckLoadRegionAndSetRelocateInfo( ARM9_STATIC, &s_cbData.arm9Stc, s_cbData.pBootSegBuf->rh.s.main_size, &SYSMi_GetWork()->romRelocateInfo[ARM9_STATIC] , s_cbData.twlFlg)){
     	if(s_cbData.pBootSegBuf->rh.s.main_size > SECURE_SEGMENT_SIZE){
-	   		retval = ReadPageGame(&s_cbData,		s_cbData.pBootSegBuf->rh.s.main_rom_offset + SECURE_SEGMENT_SIZE,
-           		                      		(u32 *)(s_cbData.arm9Stc 						   + SECURE_SEGMENT_SIZE),
-               		                	    	    s_cbData.pBootSegBuf->rh.s.main_size 	   - SECURE_SEGMENT_SIZE);
+	   		state = ReadPageGame(&s_cbData,		s_cbData.pBootSegBuf->rh.s.main_rom_offset + SECURE_SEGMENT_SIZE,
+           		                      	(u32 *)(s_cbData.arm9Stc 						   + SECURE_SEGMENT_SIZE),
+               		                	   	    s_cbData.pBootSegBuf->rh.s.main_size 	   - SECURE_SEGMENT_SIZE);
+            retval = (retval == HOTSW_SUCCESS) ? state : retval;
        	}
     }
     else{