From 7c9d18642c1451d54b3761c8d774188f0a426ca8 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 20 Jun 2008 11:58:37 +0000
Subject: [PATCH] =?UTF-8?q?TWL=E3=82=AB=E3=83=BC=E3=83=89=E3=81=AE?=
 =?UTF-8?q?=E3=83=AA=E3=83=95=E3=83=AC=E3=83=83=E3=82=B7=E3=83=A5=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=81=AE=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@1669 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c |  4 +++-
 build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c        | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c
index 58e74c47..d2183cdd 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/dsCardCommon.c
@@ -203,7 +203,7 @@ HotSwState ReadStatusNormal(CardBootData *cbd)
 {
 	GCDCmd64 cndLE;
 
-	cbd->romStatus = 0;
+	cbd->romStatus = HOTSW_ROMST_RFS_READY_MASK;
 
   	if(!HOTSW_IsCardAccessible()){
 		return HOTSW_PULLED_OUT_ERROR;
@@ -864,6 +864,8 @@ HotSwState ReadStatusGame(CardBootData *cbd)
 {
 	GCDCmd64 cndLE;
 
+	cbd->romStatus = HOTSW_ROMST_RFS_READY_MASK;
+
     if(!HOTSW_IsCardAccessible()){
 		return HOTSW_PULLED_OUT_ERROR;
     }
diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index b797d7e1..1ce0f992 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -700,6 +700,16 @@ HotSwState HOTSWi_RefreshBadBlock(u32 romMode)
         {
             state = pRefreshBadBlock(&s_cbData);
             retval = (retval == HOTSW_SUCCESS) ? state : retval;
+            while (1)
+            {
+                state = pReadStatus(&s_cbData);
+                retval = (retval == HOTSW_SUCCESS) ? state : retval;
+                if ( s_cbData.romStatus & HOTSW_ROMST_RFS_READY_MASK ||
+                     (retval != HOTSW_SUCCESS) )
+                {
+                    break;
+                }
+            }
         }
     }