From 300862b2d70b1940015942869d838768be712202 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 21 Feb 2008 02:40:46 +0000
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=8B=E3=81=A4=E9=96=93?=
 =?UTF-8?q?=E9=81=95=E3=81=A3=E3=81=9F=E3=82=A2=E3=83=89=E3=83=AC=E3=82=B9?=
 =?UTF-8?q?=E3=81=AB=E3=82=BB=E3=83=83=E3=83=88=E3=81=97=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=82=8B=E5=89=B2=E3=82=8A=E8=BE=BC=E3=81=BF=E3=83=81=E3=82=A7?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E3=83=95=E3=83=A9=E3=82=B0=EF=BC=88MC=5FDET?=
 =?UTF-8?q?=E3=81=AE=E3=81=A4=E3=82=82=E3=82=8A=E3=81=8CMIC=E3=81=AB?=
 =?UTF-8?q?=E3=82=BB=E3=83=83=E3=83=88=EF=BC=89=E3=82=92=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=E3=80=82=20=E3=82=AB=E3=83=BC=E3=83=89=E3=82=B9=E3=83=AD?=
 =?UTF-8?q?=E3=83=83=E3=83=88B=E3=81=AE=E3=82=A2=E3=82=AF=E3=82=BB?=
 =?UTF-8?q?=E3=82=B9=E6=A8=A9=E3=82=82ARM9=E3=81=8B=E3=82=89=E3=81=97?=
 =?UTF-8?q?=E3=81=8B=E5=88=B6=E5=BE=A1=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=81=AE=E3=81=A7=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@708 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../libraries_sysmenu/hotsw/ARM7/src/hotsw.c  | 29 ++++++-------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index e9a44e69..4600a550 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -1182,12 +1182,6 @@ static void InterruptCallbackCard(void)
     s_ctData.idx_pulledOut = (s_ctData.idx_pulledOut+1) % HOTSW_PULLED_MSG_NUM;
 
 	OS_TPrintf("○ - idx_pulledOut : %d\n", s_ctData.idx_pulledOut);
-    
-#ifndef DEBUG_USED_CARD_SLOT_B_
-	OS_SetIrqCheckFlagEx(OS_IE_CARD_A_IREQ);
-#else
-    OS_SetIrqCheckFlagEx(OS_IE_CARD_B_IREQ);
-#endif
 }
 
 /*---------------------------------------------------------------------------*
@@ -1207,12 +1201,6 @@ static void InterruptCallbackCardDet(void)
     s_ctData.idx_insert = (s_ctData.idx_insert+1) % HOTSW_INSERT_MSG_NUM;
 
 	OS_TPrintf("● - idx_insert : %d\n", s_ctData.idx_insert);
-    
-#ifndef DEBUG_USED_CARD_SLOT_B_
-    OS_SetIrqCheckFlagEx(OS_IE_CARD_A_DET);
-#else
-    OS_SetIrqCheckFlagEx(OS_IE_CARD_B_DET);
-#endif
 }
 
 /*---------------------------------------------------------------------------*
@@ -1224,12 +1212,6 @@ static void InterruptCallbackCardData(void)
 {
 	// データ転送終了待ちまで寝ていたのを起こす
     OS_WakeupThreadDirect(&s_ctData.thread);
-
-#ifndef DEBUG_USED_CARD_SLOT_B_
-	OS_SetIrqCheckFlagEx(OS_IE_CARD_A_DATA);
-#else
-    OS_SetIrqCheckFlagEx(OS_IE_CARD_B_DATA);
-#endif
 }
 
 /*---------------------------------------------------------------------------*
@@ -1253,11 +1235,13 @@ static void SetHotSwState(BOOL busy)
 
   Description:  アクセス権を設定する
  *---------------------------------------------------------------------------*/
+#ifdef  SDK_ARM9
 static inline void SetExCardProcessor(MIProcessor proc)
 {
     reg_HOTSW_EXMEMCNT =
         (u16)((reg_HOTSW_EXMEMCNT & ~HOTSW_EXMEMCNT_SELB_MASK) | (proc << HOTSW_EXMEMCNT_SELB_SHIFT));
 }
+#endif
 
 /*---------------------------------------------------------------------------*
   Name:			AllocateExCardBus
@@ -1267,9 +1251,12 @@ static inline void SetExCardProcessor(MIProcessor proc)
 static void AllocateExCardBus(void)
 {
 #ifdef  SDK_ARM9
+    // preset reset flag with status of disable interrupts in OSi_DoTryLockByWord
+    if ( ! ( reg_MI_MC & REG_MI_MC_SL2_CDET_MASK ) )
+    {
+        reg_MI_MCCNT1 |= REG_MI_MCCNT2_RESB_MASK;
+    }
     SetExCardProcessor(MI_PROCESSOR_ARM9);    // Arm9側で動作している場合
-#else
-    SetExCardProcessor(MI_PROCESSOR_ARM7);	  // Arm7側で動作している場合
 #endif
 }
 
@@ -1280,7 +1267,9 @@ static void AllocateExCardBus(void)
  *---------------------------------------------------------------------------*/
 static void FreeExCardBus(void)
 {
+#ifdef  SDK_ARM9
     SetExCardProcessor(MI_PROCESSOR_ARM7);    // Card for SUB
+#endif
 }
 
 /*---------------------------------------------------------------------------*