From 63c3eb35658df4091f636dc4bcc7fe9663cfea6a Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 26 Feb 2008 11:56:39 +0000
Subject: [PATCH] =?UTF-8?q?=EF=BC=91=E3=82=B9=E3=83=AD=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E6=99=82=E3=81=AE=E3=82=B9=E3=82=BF?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E3=82=AA=E3=83=BC=E3=83=90=E3=83=BC=E3=83=95?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82=20?=
 =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E3=81=AE=E3=83=AD=E3=83=83=E3=82=AF?=
 =?UTF-8?q?ID=E5=8F=96=E5=BE=97=E3=82=92=E5=89=8A=E9=99=A4=E3=80=82=20?=
 =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E7=94=A8=E3=83=8F=E3=83=83?=
 =?UTF-8?q?=E3=82=B7=E3=83=A5=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=81=AE?=
 =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=82=88=E3=81=A3=E3=81=A6?=
 =?UTF-8?q?=E7=84=A1=E9=99=90=E3=81=AB=E3=82=AB=E3=83=BC=E3=83=89ON/OFF?=
 =?UTF-8?q?=E3=81=97=E7=B6=9A=E3=81=91=E3=82=8B=E5=95=8F=E9=A1=8C=E3=81=AE?=
 =?UTF-8?q?=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@748 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h | 2 ++
 build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c          | 9 +++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
index ecc0ad32..fdba3b67 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
+++ b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
@@ -126,6 +126,7 @@ extern "C" {
 #define     reg_HOTSW_MCSCR2                    reg_MI_MCSCR2_A
 
 #define     HOTSW_IF_CARD_DET                   OS_IE_CARD_A_DET
+#define     HOTSW_IF_CARD_IREQ                  OS_IE_CARD_A_IREQ
 
 #else
 // Slot B
@@ -150,6 +151,7 @@ extern "C" {
 #define     reg_HOTSW_MCSCR2                    reg_MI_MCSCR2_B
 
 #define     HOTSW_IF_CARD_DET                   OS_IE_CARD_B_DET
+#define     HOTSW_IF_CARD_IREQ                  OS_IE_CARD_B_IREQ
 
 #endif
 
diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index ce8cc6e5..dce098ac 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -36,7 +36,7 @@
 #define		ROM_EMULATION_START_OFS				0x160
 #define		ROM_EMULATION_END_OFS				0x180
 
-#define		HOTSW_THREAD_STACK_SIZE				1024		// スタックサイズ
+#define		HOTSW_THREAD_STACK_SIZE				(1024 + PAGE_SIZE)	// スタックサイズ
 #define		HOTSW_THREAD_PRIO					11			// カード電源ON → ゲームモードのスレッド優先度
 #define 	HOTSW_MSG_BUFFER_NUM				32			// 受信バッファの数
 #define		HOTSW_INSERT_MSG_NUM				16			// 挿し割り込み送信メッセージの数
@@ -307,9 +307,6 @@ static HotSwState LoadCardData(void)
 
     // ブート処理開始
 	if(HOTSW_IsCardAccessible()){
-        // Arm9との排他制御用ロックIDを取得する
-		u16 id = (u16)OS_GetLockID();
-        
 		// カード側でKey Tableをロードする
         state  = LoadTable();
         retval = (retval == HOTSW_SUCCESS) ? state : retval;
@@ -526,7 +523,7 @@ static HotSwState LoadBannerData(void)
     // バナーリードが成功していたら各種フラグTRUE その他の場合はFALSE (この関数の外で排他制御されているからここでは排他制御しないでOK)
     state = (retval == HOTSW_SUCCESS) ? TRUE : FALSE;
     SYSMi_GetWork()->flags.hotsw.isValidCardBanner  = state;
-	SYSMi_GetWork()->flags.hotsw.isCardStateChanged = state;
+	SYSMi_GetWork()->flags.hotsw.isCardStateChanged = (u8)state;
 	SYSMi_GetWork()->flags.hotsw.isExistCard 		 = state;
 
 	return retval;
@@ -620,7 +617,7 @@ static HotSwState LoadStaticModule(void)
             // ハッシュコンテキスト計算終了を通知
             
         }
-#define MY_DEBUG
+//#define MY_DEBUG
 #ifdef  MY_DEBUG
         // Arm9常駐モジュール Hash値のチェック
         if(!CheckArm9HashValue()){