From a1cb200812da805d0253ca5439f1a857d65f1ba5 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 19 Dec 2007 02:35:51 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0:Akabane=20Jumpei=20=E3=82=AB?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E6=8C=BF=E3=81=97=E3=81=AE=E7=8A=B6=E6=85=8B?=
 =?UTF-8?q?=E3=81=A7=E7=AB=8B=E3=81=A1=E4=B8=8A=E3=81=92=E3=81=9F=E6=99=82?=
 =?UTF-8?q?=E3=80=81HOTSW=5FBoot=E9=96=A2=E6=95=B0=E3=82=92=E5=91=BC?=
 =?UTF-8?q?=E3=81=B6=E3=81=AE=E3=81=A7=E3=81=AA=E3=81=8F=E3=80=81=E3=82=B9?=
 =?UTF-8?q?=E3=83=AC=E3=83=83=E3=83=89=E3=82=92=E8=B5=B7=E5=8B=95=E3=81=95?=
 =?UTF-8?q?=E3=81=9B=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=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@375 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/components/hyena.TWL/src/main.c          |  4 ----
 build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 18 ++++++++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/build/components/hyena.TWL/src/main.c b/build/components/hyena.TWL/src/main.c
index 07c9278f..5f9a6cb9 100644
--- a/build/components/hyena.TWL/src/main.c
+++ b/build/components/hyena.TWL/src/main.c
@@ -187,10 +187,6 @@ TwlSpMain(void)
 
     // 活栓挿抜機能初期化
     HOTSW_Init();
-    
-    // カードがささっていたらブート開始
-    (void)HOTSW_Boot();
-//		SYSMi_GetWork()->is1stCardChecked  = TRUE;
 	
     while (TRUE)
     {
diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index 7fc71859..e621fe80 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -115,6 +115,9 @@ void HOTSW_Init(void)
     reg_MI_MC2 = 0xc8;
 #endif
 
+	// カードブート用構造体の初期化
+	MI_CpuClear32(&s_cbData, sizeof(CardBootData));
+    
 	// カードブート用スレッドの生成
 	OS_CreateThread(&s_MCThread,
                     McThread,
@@ -132,11 +135,18 @@ void HOTSW_Init(void)
 
     // Secure Segment バッファの設定
     HOTSW_SetSecureSegmentBuffer((void *)SYSM_CARD_NTR_SECURE_BUF, SECURE_AREA_SIZE );
-
-	// カードブート用構造体の初期化
-	MI_CpuClear32(&s_cbData, sizeof(CardBootData));
     
-	OS_TPrintf("*** sizeof(ROM_Header) : 0x%08x\n", sizeof(ROM_Header));
+    // CDETフラグがおちていたらカードブートスレッドを起動する
+	if(!(reg_MI_MC1 & SLOT_STATUS_CDET_MSK)){
+        OS_PutString("Card Boot Start\n");
+		OS_WakeupThreadDirect(&s_MCThread);
+	}
+    else{
+		OS_PutString("No Card...\n");
+#ifdef DEBUG_USED_CARD_SLOT_B_
+		SYSMi_GetWork()->is1stCardChecked  = TRUE;
+#endif
+    }
 }
 
 /* -----------------------------------------------------------------