From a89469a962dea7ab1ea32856cfa8e3eb6f42fc93 Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 5 Jun 2008 06:06:36 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=96=E3=83=BC=E3=83=88=E5=84=AA=E5=85=88?=
 =?UTF-8?q?=E5=BA=A6=E3=81=AB=E5=BE=93=E3=81=84=E3=80=81=E6=95=B4=E7=90=86?=
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@1583 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../sysmenu/ARM9/src/sysmenu_lib.c            | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
index 73269888..80f64c7c 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
@@ -405,9 +405,32 @@ static TitleProperty *SYSMi_CheckShortcutBoot2( void )
 {
     MI_CpuClear8( &s_bootTitleBuf, sizeof(TitleProperty) );
 
+
+    //-----------------------------------------------------
+    // TWL設定データ未入力時の初回起動シーケンス起動
+    //-----------------------------------------------------
+#if 0
+#ifdef ENABLE_INITIAL_SETTINGS_
+    if( !LCFG_TSD_IsFinishedInitialSetting() ) {
+        s_bootTitleBuf.titleID = SYSMi_getTitleIdOfMachineSettings();
+        if(s_bootTitleBuf.titleID != 0)
+		{
+            s_bootTitleBuf.flags.isLogoSkip = TRUE;                    // 本体設定を起動できる時だけロゴデモを飛ばす
+		}
+        s_bootTitleBuf.flags.bootType = LAUNCHER_BOOTTYPE_NAND;
+        s_bootTitleBuf.flags.isValid = TRUE;
+        s_bootTitleBuf.flags.isAppRelocate = FALSE;
+        s_bootTitleBuf.flags.isAppLoadCompleted = FALSE;
+        return &s_bootTitleBuf;
+    }
+#endif // ENABLE_INITIAL_SETTINGS_
+#endif
+
+
     //-----------------------------------------------------
     // スタンドアロン起動時、ショートカットキー(select)
     // を押しながらの起動で本体設定の直接起動
+    // [TODO:]最終的にはL+R+Start起動でタッチパネル設定のショートカット起動になる予定
     //-----------------------------------------------------
     if( ( PAD_Read() & SYSM_PAD_SHORTCUT_MACHINE_SETTINGS ) ==
 		SYSM_PAD_SHORTCUT_MACHINE_SETTINGS )
@@ -460,25 +483,6 @@ static TitleProperty *SYSMi_CheckShortcutBoot2( void )
 	}
 #endif
 
-    //-----------------------------------------------------
-    // TWL設定データ未入力時の初回起動シーケンス起動
-    //-----------------------------------------------------
-#if 0
-#ifdef ENABLE_INITIAL_SETTINGS_
-    if( !LCFG_TSD_IsFinishedInitialSetting() ) {
-        s_bootTitleBuf.titleID = SYSMi_getTitleIdOfMachineSettings();
-        if(s_bootTitleBuf.titleID != 0)
-		{
-            s_bootTitleBuf.flags.isLogoSkip = TRUE;                    // 本体設定を起動できる時だけロゴデモを飛ばす
-		}
-        s_bootTitleBuf.flags.bootType = LAUNCHER_BOOTTYPE_NAND;
-        s_bootTitleBuf.flags.isValid = TRUE;
-        s_bootTitleBuf.flags.isAppRelocate = FALSE;
-        s_bootTitleBuf.flags.isAppLoadCompleted = FALSE;
-        return &s_bootTitleBuf;
-    }
-#endif // ENABLE_INITIAL_SETTINGS_
-#endif
 
     return NULL;                                                    // 「ブート内容未定」でリターン
 }