From 581bab774801137e183feeefd87f0eda4ef4916a Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 30 Mar 2011 01:50:28 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=BB=E3=82=A2=E3=83=97=E3=83=AA=E3=83=AA?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E5=8F=96=E5=BE=97=E6=99=82=E3=81=AB=E3=82=A8?=
 =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=81=A8=E3=82=A2=E3=83=97=E3=83=AA=E3=82=92=E6=B6=88=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F=E9=A1=8C=E3=81=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20=E3=83=BB=E3=82=B7=E3=83=A7=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=82=AB=E3=83=83=E3=83=88=E6=99=82=E3=81=AB=E3=83=AA=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=81=8C=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=81=AE=E4=BF=AE=E6=AD=A3?=
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@2998 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../sysmenu/ARM9/src/sysmenu_lib.c                 | 11 ++++++++++-
 .../util/ARM9/src/util_menuAppManager.c            | 14 ++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
index 30b04658..f7adadbe 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
@@ -443,7 +443,16 @@ static TitleProperty *SYSMi_CheckShortcutBoot1( void )
             ( ( PAD_Read() == SYSM_PAD_PRODUCTION_SHORTCUT_CARD_BOOT ) && 
               ( !LCFG_TSD_IsFinishedBrokenTWLSettings() || !LCFG_TSD_IsFinishedInitialSetting() || !LCFG_TSD_IsFinishedInitialSetting_Launcher() ) )
             ){
-            return SYSMi_ShortcutCardBootSub();
+            const ROM_Header_Short *header = (ROM_Header_Short *)SYSM_CARD_ROM_HEADER_BAK;
+            
+            if(( header->platform_code & PLATFORM_CODE_FLAG_TWL ) && !UTL_CheckAppRegion( header->card_region_bitmap ))
+            {
+                return NULL;
+            }
+            else
+            {
+                return SYSMi_ShortcutCardBootSub();
+            }
         }
 	    //-----------------------------------------------------
 	    // ISデバッガ起動 or
diff --git a/build/libraries_sysmenu/util/ARM9/src/util_menuAppManager.c b/build/libraries_sysmenu/util/ARM9/src/util_menuAppManager.c
index 5fbfd4e9..af6c1ae3 100644
--- a/build/libraries_sysmenu/util/ARM9/src/util_menuAppManager.c
+++ b/build/libraries_sysmenu/util/ARM9/src/util_menuAppManager.c
@@ -380,6 +380,7 @@ static void AMN_initCardTitleList_()
 {
 }
 
+#if 0
 // 指定されたtitleIDのタイトルツリーを消去
 #define TITLE_TREE_PATH_LENGTH 12+8+1+8+1
 static void AMNi_deleteTitleTree( NAMTitleId titleID )
@@ -389,6 +390,7 @@ static void AMNi_deleteTitleTree( NAMTitleId titleID )
 	(void)FS_DeleteDirectoryAuto( path );
 	OS_TPrintf( "AMNi_deleteTitleTree : delete %s\n", path );
 }
+#endif
 
 static BOOL AMNi_getAndAddNandTitleData( NAMTitleId titleID, BOOL readShowData )
 {
@@ -432,8 +434,8 @@ static BOOL AMNi_getAndAddNandTitleData( NAMTitleId titleID, BOOL readShowData )
         if(readLen != NAM_OK){
             // error
             SDK_ASSERT( FALSE );
-            // タイトル消去
-            AMNi_deleteTitleTree( titleID );
+            // フェータルエラーを設定
+            UTL_SetFatalError( FATAL_ERROR_LOAD_OPENFILE_FAILED );
             return FALSE;
         }
         
@@ -447,8 +449,8 @@ static BOOL AMNi_getAndAddNandTitleData( NAMTitleId titleID, BOOL readShowData )
         {
             // error
             SDK_ASSERT( FALSE );
-            // タイトル消去
-            AMNi_deleteTitleTree( titleID );
+            // フェータルエラーを設定
+            UTL_SetFatalError( FATAL_ERROR_LOAD_OPENFILE_FAILED );
             return FALSE;
         }
         
@@ -463,8 +465,8 @@ static BOOL AMNi_getAndAddNandTitleData( NAMTitleId titleID, BOOL readShowData )
             // error
             SDK_ASSERT( FALSE );
             FS_CloseFile(file);
-            // タイトル消去
-            AMNi_deleteTitleTree( titleID );
+            // フェータルエラーを設定
+            UTL_SetFatalError( FATAL_ERROR_LOAD_READHEADER_FAILED );
             return FALSE;
         }