From 49c5affe59e28c6a820ef7f8abf3a1935618f9ee Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 14 Mar 2008 07:35:43 +0000
Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E3=81=ABsysmenu=E3=81=A7DO=5FNOT=5FSH?=
 =?UTF-8?q?OW=5FLAUNCHER=E3=81=8CON=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6?=
 =?UTF-8?q?=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3=E2=80=A6?=
 =?UTF-8?q?=E2=80=A6=20=E3=81=A4=E3=81=84=E3=81=A7=E3=81=AB=E3=80=81?=
 =?UTF-8?q?=E7=89=87=E6=96=B9=E3=81=A0=E3=81=91=E3=83=93=E3=83=AB=E3=83=89?=
 =?UTF-8?q?=E3=82=B9=E3=82=A4=E3=83=83=E3=83=81=E6=8C=87=E5=AE=9A=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AA=E4=BA=8B=E6=95=85=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E3=81=AE=E3=81=9F=E3=82=81=E3=81=AE=E3=82=B3=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E8=BF=BD=E5=8A=A0?=
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@883 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/sysmenu/ARM9/Makefile     |  2 ++
 .../sysmenu/ARM9/src/sysmenu_lib.c                |  8 ++++++++
 build/systemMenu_RED/Launcher/ARM9/src/main.c     | 15 ++++++++-------
 include/sysmenu/sysmenu_lib/common/sysmenu_api.h  |  1 +
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/Makefile b/build/libraries_sysmenu/sysmenu/ARM9/Makefile
index 7f8c46c2..001f8c02 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/Makefile
+++ b/build/libraries_sysmenu/sysmenu/ARM9/Makefile
@@ -43,7 +43,9 @@ SRCS			=	sysmenu_lib.c \
 
 TARGET_LIB		=	libsysmenu$(TWL_LIBSUFFIX).a
 
+ifdef DO_NOT_SHOW_LAUNCHER
 MACRO_FLAGS += -DDO_NOT_SHOW_LAUNCHER
+endif
 
 include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
index d9b24321..554deb29 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
@@ -225,6 +225,14 @@ TitleProperty *SYSM_ReadParameters( void )
     return pBootTitle;
 }
 
+BOOL SYSM_IsLauncherHidden( void )
+{
+#ifdef DO_NOT_SHOW_LAUNCHER
+	return TRUE;
+#else
+	return FALSE;
+#endif
+}
 
 // ショートカット起動のチェック
 static TitleProperty *SYSMi_CheckShortcutBoot( void )
diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c
index ffcfac25..7c228201 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/main.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c
@@ -184,15 +184,16 @@ void TwlMain( void )
     }
 
 // ランチャー画面を絶対表示しないバージョン
-#ifdef DO_NOT_SHOW_LAUNCHER
-	if(direct_boot == FALSE)
+	if( SYSM_IsLauncherHidden() )
 	{
-		state = STOP;
-	}else
-	{
-		state = LOAD_START;
+		if(direct_boot == FALSE)
+		{
+			state = STOP;
+		}else
+		{
+			state = LOAD_START;
+		}
 	}
-#endif
 
     // チャンネルをロックする
     SND_LockChannel((1 << L_CHANNEL) | (1 << R_CHANNEL), 0);
diff --git a/include/sysmenu/sysmenu_lib/common/sysmenu_api.h b/include/sysmenu/sysmenu_lib/common/sysmenu_api.h
index 8f584d2f..ce28303c 100644
--- a/include/sysmenu/sysmenu_lib/common/sysmenu_api.h
+++ b/include/sysmenu/sysmenu_lib/common/sysmenu_api.h
@@ -132,6 +132,7 @@ extern BOOL SYSM_IsValidTSD( void );											// TWL
 extern void SYSM_SetValidTSD( BOOL valid );										// TWL設定データの有効／無効フラグを設定する。
 extern const LauncherParamBody *SYSM_GetLauncherParamBody( void );					// リセットパラメータの取得
 
+extern BOOL SYSM_IsLauncherHidden( void );										// ランチャーの画面を表示しないバージョンか？
 
 #ifdef __cplusplus
 }