From e09c20472c9ca19fcf185b80f67975e21929178b Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 10 Jul 2008 04:13:09 +0000
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=9B=9E=E8=B5=B7=E5=8B=95=E3=82=B7?=
 =?UTF-8?q?=E3=83=BC=E3=82=B1=E3=83=B3=E3=82=B9=E3=81=AA=E3=81=A9=E3=81=AE?=
 =?UTF-8?q?=E5=84=AA=E5=85=88=E9=A0=86=E4=BD=8D=E3=81=AE=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20=E3=82=A2=E3=83=97=E3=83=AA=E8=B5=B7=E5=8B=95=E6=99=82?=
 =?UTF-8?q?=E3=81=AE=E3=82=AB=E3=83=BC=E3=83=89=E7=8A=B6=E6=85=8B=E8=A8=AD?=
 =?UTF-8?q?=E5=AE=9A=E6=9D=A1=E4=BB=B6=E3=81=AE=E5=A4=89=E6=9B=B4?=
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@1836 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c | 6 +++---
 build/libraries_sysmenu/sysmenu/ARM9/src/title.c       | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
index 3e59fe3c..62c1b1eb 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
@@ -470,11 +470,11 @@ static TitleProperty *SYSMi_CheckShortcutBoot2( void )
     //-----------------------------------------------------
     // TWL設定データ未設定時の初回起動シーケンス起動
     //-----------------------------------------------------
-    if( !LCFG_TSD_IsFinishedInitialSetting() ) {
+    else if( !LCFG_TSD_IsFinishedInitialSetting() ) {
 		argument      = 0;
 		isSetArgument = FALSE;
 		isBootMSET    = TRUE;
-    }
+    }else 
 #endif
 	
     //-----------------------------------------------------
@@ -493,7 +493,7 @@ static TitleProperty *SYSMi_CheckShortcutBoot2( void )
     // ささっていない場合は本体設定を起動
     //-----------------------------------------------------
 #ifdef DO_NOT_SHOW_LAUNCHER
-	if( SYSM_IsExistCard() )
+	else if( SYSM_IsExistCard() )
 	{
         s_bootTitleBuf.flags.isAppRelocate = TRUE;
         s_bootTitleBuf.flags.isAppLoadCompleted = FALSE;
diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
index cfc1b370..3115c90b 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c
@@ -472,14 +472,17 @@ static void SYSMi_FinalizeHotSWAsync( TitleProperty *pBootTitle, ROM_Header *hea
 	{
 		case LAUNCHER_BOOTTYPE_NAND:
 		case LAUNCHER_BOOTTYPE_TEMP:
-			if ( head->s.platform_code & PLATFORM_CODE_FLAG_TWL )
+			if ( ( head->s.platform_code & PLATFORM_CODE_TWL_LIMITED ) == PLATFORM_CODE_TWL_LIMITED )
 			{
 				if(rh->s.access_control.game_card_nitro_mode){
                 	card_state = HOTSW_CARD_STATE_GAME_MODE;
         		}
                 else if(rh->s.access_control.game_card_on){
                 	card_state = HOTSW_CARD_STATE_NORMAL_MODE;
-				} 
+				}else
+				{
+					card_state = HOTSW_CARD_STATE_POWER_OFF;
+				}
 			}
 			else
 			{