From 5a550bf4c26b1752d6af3bef8ede222a2a1c82be Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 10 Sep 2008 11:20:46 +0000
Subject: [PATCH] =?UTF-8?q?ARM9=E3=81=8B=E3=82=89=E3=81=AE=E3=83=A1?=
 =?UTF-8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=A7ARM7=E3=81=A7?=
 =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89=E3=83=87=E3=83=BC=E3=82=BF=E3=82=92?=
 =?UTF-8?q?=E8=AA=AD=E3=81=BF=E5=87=BA=E3=81=99=E3=81=A8=E3=81=8D=E3=81=AB?=
 =?UTF-8?q?=E3=80=81=E3=82=AB=E3=83=BC=E3=83=89=E3=83=90=E3=82=B9=E3=81=AE?=
 =?UTF-8?q?=E3=83=AD=E3=83=83=E3=82=AF=E3=81=8C=E3=81=A7=E3=81=8D=E3=81=A6?=
 =?UTF-8?q?=E3=82=8B=E3=81=8B=E3=81=A9=E3=81=86=E3=81=8B=E3=83=81=E3=82=A7?=
 =?UTF-8?q?=E3=83=83=E3=82=AF?=
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/branches/20080910_debug_dht_phase1@2478 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h | 1 +
 build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c          | 9 +++++++++
 include/sysmenu/sysmenu_lib/common/sysmenu_work.h       | 1 +
 3 files changed, 11 insertions(+)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
index d4aa97a8..18b14fd9 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
+++ b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
@@ -238,6 +238,7 @@ typedef enum HotSwState{
     HOTSW_MODE_ERROR,
     HOTSW_ILLEGAL_CARD_ERROR,
     HOTSW_GAMEMODE_ID_CHECK_ERROR,
+    HOTSW_BUS_LOCK_ERROR,
     HOTSW_UNEXPECTED_ERROR
 } HotSwState;
 
diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index 9491f6f1..d4965fc9 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -927,6 +927,11 @@ static void ReadCardData(u32 src, u32 dest, u32 size)
     if(s_cbData.id_gam != s_gameID){
 		state = HOTSW_GAMEMODE_ID_CHECK_ERROR;
     }
+
+	// [Debug]
+    if(!(reg_MI_EXMEMCNT_L & REG_MI_EXMEMCNT_L_MP_MASK)){
+		state = HOTSW_BUS_LOCK_ERROR;
+    }
     
     while(size > 0 && state == HOTSW_SUCCESS){
         // --- Boot Segment
@@ -1025,6 +1030,10 @@ static void ReadCardData(u32 src, u32 dest, u32 size)
           case HOTSW_GAMEMODE_ID_CHECK_ERROR:
             retval = CARD_READ_ID_CHECK_ERROR;
             break;
+
+          case HOTSW_BUS_LOCK_ERROR:
+            retval = CARD_READ_BUS_LOCK_ERROR;
+            break;
             
           default:
             retval = CARD_READ_UNEXPECTED_ERROR;
diff --git a/include/sysmenu/sysmenu_lib/common/sysmenu_work.h b/include/sysmenu/sysmenu_lib/common/sysmenu_work.h
index 06de63a9..f0f4e01c 100644
--- a/include/sysmenu/sysmenu_lib/common/sysmenu_work.h
+++ b/include/sysmenu/sysmenu_lib/common/sysmenu_work.h
@@ -44,6 +44,7 @@ typedef enum CardDataReadState {
     CARD_READ_MODE_ERROR,
     CARD_READ_BUSY,
     CARD_READ_ID_CHECK_ERROR,
+    CARD_READ_BUS_LOCK_ERROR,
     CARD_READ_UNEXPECTED_ERROR
 }
 CardDataReadState;