From e876697b8fb621af48f49c9c6388f120cf836966 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 15 Apr 2008 12:18:09 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=B2=E3=83=BC=E3=83=A0=E3=82=AB=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E6=8A=9C=E3=81=91=E6=A4=9C=E5=87=BA=E6=99=82=E3=81=AE?=
 =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89=E9=9B=BB=E6=BA=90OFF=E3=82=B3?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E8=BF=BD=E5=8A=A0=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@1150 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../libraries_sysmenu/hotsw/ARM7/src/hotsw.c  | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index f62a8241..0f7da581 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -25,6 +25,8 @@
 
 #define DEBUG_MODE
 
+//#define HOTSW_DISABLE_FORCE_CARD_OFF
+
 // カード電源ONからROMヘッダロードまでの期間にスリープに入る時のワンセグ対策しない場合
 //#define HOWSW_ENABLE_DEEP_SLEEP_WHILE_INSERT_CARD
 
@@ -1653,6 +1655,19 @@ static void MonitorThread(void *arg)
  *---------------------------------------------------------------------------*/
 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;
@@ -1663,14 +1678,6 @@ static void InterruptCallbackCard(void)
     // メッセージインデックスをインクリメント
     HotSwThreadData.idx_pulledOut = (HotSwThreadData.idx_pulledOut+1) % HOTSW_PULLED_MSG_NUM;
 
-/*  // スロットのモードを
-    {
-        u32 mode = GetMcSlotMode();
-        if(mode == SLOT_STATUS_MODE_01 || mode == SLOT_STATUS_MODE_10){
-            SetMcSlotMode(SLOT_STATUS_MODE_11);
-        }
-    }*/
-
     OS_PutString("○\n");
 }