From e00d081cbf2335eae793333ccbde64cc78995ad6 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 19 May 2008 06:45:01 +0000
Subject: [PATCH] =?UTF-8?q?(=E6=9B=B4=E6=96=B0:Akabane=20Jumpei)=20DS?=
 =?UTF-8?q?=E3=83=86=E3=83=AC=E3=83=93=E5=AF=BE=E7=AD=96=E3=80=82=E3=82=AB?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E6=8A=9C=E3=81=91=E6=A4=9C=E5=87=BA=E3=81=AF?=
 =?UTF-8?q?=E3=80=81=E6=8A=9C=E3=81=91=E5=89=B2=E3=82=8A=E8=BE=BC=E3=81=BF?=
 =?UTF-8?q?=E3=82=92=E4=BD=BF=E3=82=8F=E3=81=9A=E3=81=AB=E3=80=81=E3=83=9D?=
 =?UTF-8?q?=E3=83=BC=E3=83=AA=E3=83=B3=E3=82=B0=E3=81=A7=E3=82=AB=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E7=8A=B6=E6=85=8B=E7=9B=A3=E8=A6=96=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4=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@1397 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../libraries_sysmenu/hotsw/ARM7/src/hotsw.c  | 48 ++++---------------
 1 file changed, 10 insertions(+), 38 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index e48d0a91..f9485696 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -73,9 +73,7 @@ static void SetInterruptCallback( OSIrqMask intr_bit, OSIrqFunction func );
 static void SetInterruptCallbackEx( OSIrqMask intr_bit, void *func );
 static void SetInterrupt(void);
 
-static void InterruptCallbackCard(void);
 static void InterruptCallbackCardDet(void);
-static void InterruptCallbackNDma(void);
 static void InterruptCallbackPxi(PXIFifoTag tag, u32 data, BOOL err);
 
 static void LockHotSwRsc(OSLockWord* word);
@@ -2174,6 +2172,16 @@ static void MonitorThread(void *arg)
 
             // 本当は抜けてた場合
             if(isPullOutNow){
+#ifndef HOTSW_DISABLE_FORCE_CARD_OFF
+			    {
+        			u32 mode = GetMcSlotMode();
+        			if(mode == SLOT_STATUS_MODE_01 || mode == SLOT_STATUS_MODE_10){
+            			SetMcSlotMode(SLOT_STATUS_MODE_11);
+        			}
+        			OS_TPrintf("slot status: %x\n", mode);
+    			}
+#endif
+                
                 HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].ctrl  = FALSE;
                 HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].value = 0;
                 HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].type  = HOTSW_PULLOUT;
@@ -2208,40 +2216,6 @@ static void MonitorThread(void *arg)
 }
 
 
-/*---------------------------------------------------------------------------*
-  Name:         InterruptCallbackCard
-
-  Description: カードB抜け割り込みハンドラ
- *---------------------------------------------------------------------------*/
-static void InterruptCallbackCard(void)
-{
-    // スロット電源ON時は強制OFF
-    // （エミュレーションROMは旧コネクタでの強制OFFでデータが化けることがある）
-#ifndef HOTSW_DISABLE_FORCE_CARD_OFF
-//    if ( ! HOTSWi_IsRomEmulation() )
-    {
-        u32 mode = GetMcSlotMode();
-        if(mode == SLOT_STATUS_MODE_01 || mode == SLOT_STATUS_MODE_10){
-            SetMcSlotMode(SLOT_STATUS_MODE_11);
-        }
-        OS_TPrintf("slot status: %x\n", mode);
-    }
-#endif
-
-    HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].ctrl  = FALSE;
-    HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].value = 0;
-    HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].type  = HOTSW_PULLOUT;
-
-    // メッセージ送信
-    OS_SendMessage(&HotSwThreadData.hotswQueue, (OSMessage *)&HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut], OS_MESSAGE_NOBLOCK);
-
-    // メッセージインデックスをインクリメント
-    HotSwThreadData.idx_pulledOut = (HotSwThreadData.idx_pulledOut+1) % HOTSW_PULLED_MSG_NUM;
-
-    OS_PutString("○\n");
-}
-
-
 /*---------------------------------------------------------------------------*
   Name:         InterruptCallbackCardDet
 
@@ -2400,10 +2374,8 @@ static void SetInterruptCallbackEx( OSIrqMask intr_bit, void *func )
 static void SetInterrupt(void)
 {
 #ifndef DEBUG_USED_CARD_SLOT_B_
-    SetInterruptCallback( OS_IE_CARD_A_IREQ , InterruptCallbackCard );
     SetInterruptCallback( OS_IE_CARD_A_DET  , InterruptCallbackCardDet );
 #else
-    SetInterruptCallback( OS_IE_CARD_B_IREQ , InterruptCallbackCard );
     SetInterruptCallback( OS_IE_CARD_B_DET  , InterruptCallbackCardDet );
 #endif