From 8cedf4f6e0671d554a886b42126fbb051bfb8ed2 Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Fri, 14 Mar 2008 07:16:18 +0000 Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E8=A1=A8=E7=A4=BA=E3=81=97?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E3=81=AELauncher=E5=A4=89=E6=9B=B4=20=E3=80=80=E3=83=BB?= =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89=E3=82=92=E6=8C=BF=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=AF=E3=82=AB=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=81=AE=E3=82=A2=E3=83=97=E3=83=AA=E3=82=92=E8=B5=B7?= =?UTF-8?q?=E5=8B=95=20=E3=80=80=E3=83=BB=E3=82=AB=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=82=92=E6=8C=BF=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=8A=E3=82=88=E3=81=B3Select=E6=8A=BC?= =?UTF-8?q?=E4=B8=8B=E8=B5=B7=E5=8B=95=E3=81=A7=E3=81=AF=E6=9C=AC=E4=BD=93?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=8C=E8=B5=B7=E5=8B=95=20=E3=80=80?= =?UTF-8?q?=E3=83=BB=E7=94=BB=E9=9D=A2=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=AE?= =?UTF-8?q?Launcher=E3=82=92=E3=83=93=E3=83=AB=E3=83=89=E3=81=99=E3=82=8B?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AF=E3=80=81=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E3=82=B9=E3=82=A4=E3=83=83=E3=83=81=E3=81=ABDO=5FNOT=5FSHOW=5F?= =?UTF-8?q?LAUNCHER=E3=82=92=E6=8C=87=E5=AE=9A=E3=81=97=E3=81=A6sysmenu?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9=E3=83=AA=E3=81=8A=E3=82=88?= =?UTF-8?q?=E3=81=B3Launcher=E3=82=92=E3=83=93=E3=83=AB=E3=83=89=E3=81=99?= =?UTF-8?q?=E3=82=8B=E5=BF=85=E8=A6=81=E3=81=82=E3=82=8A=20=E3=80=80?= =?UTF-8?q?=E3=80=80=EF=BC=88=E7=89=87=E6=96=B9=E3=81=A0=E3=81=91=E3=82=B9?= =?UTF-8?q?=E3=82=A4=E3=83=83=E3=83=81=E6=8C=87=E5=AE=9A=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=81=99=E3=82=8B=E3=81=AA=E3=81=A9?= =?UTF-8?q?=E3=81=AE=E4=BA=8B=E6=95=85=E3=81=AB=E8=A6=81=E6=B3=A8=E6=84=8F?= =?UTF-8?q?=EF=BC=89?= 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@882 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/sysmenu/ARM9/Makefile | 2 + .../sysmenu/ARM9/src/sysmenu_lib.c | 38 ++++++++++++++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/Makefile b/build/libraries_sysmenu/sysmenu/ARM9/Makefile index 07ad0e5c..7f8c46c2 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/Makefile +++ b/build/libraries_sysmenu/sysmenu/ARM9/Makefile @@ -43,6 +43,8 @@ SRCS = sysmenu_lib.c \ TARGET_LIB = libsysmenu$(TWL_LIBSUFFIX).a +MACRO_FLAGS += -DDO_NOT_SHOW_LAUNCHER + include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c index 09bf37cb..d9b24321 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c @@ -244,7 +244,7 @@ static TitleProperty *SYSMi_CheckShortcutBoot( void ) SYSM_IsInspectCard() || ( ( PAD_Read() & SYSM_PAD_PRODUCTION_SHORTCUT_CARD_BOOT ) == SYSM_PAD_PRODUCTION_SHORTCUT_CARD_BOOT ) - ) { + ){ s_bootTitle.flags.isAppRelocate = TRUE; s_bootTitle.flags.isAppLoadCompleted = TRUE; s_bootTitle.flags.isInitialShortcutSkip = TRUE; // 初回起動シーケンスを飛ばす @@ -280,7 +280,41 @@ static TitleProperty *SYSMi_CheckShortcutBoot( void ) return &s_bootTitle; } - //[TODO:]スタンドアロンで何らかの条件を満たした場合、カード強制起動させる + // スタンドアロン起動時 + // ランチャー画面を表示しないバージョンの場合 + // カードがささっていたらカードを起動する + // ささっていない場合は本体設定を起動 +#ifdef DO_NOT_SHOW_LAUNCHER + if( SYSM_IsExistCard() ) + { + s_bootTitle.flags.isAppRelocate = TRUE; + s_bootTitle.flags.isAppLoadCompleted = TRUE; + s_bootTitle.flags.isInitialShortcutSkip = TRUE; // 初回起動シーケンスを飛ばす + s_bootTitle.flags.isLogoSkip = TRUE; // ロゴデモを飛ばす + s_bootTitle.flags.bootType = LAUNCHER_BOOTTYPE_ROM; + s_bootTitle.flags.isValid = TRUE; + // ROMヘッダバッファのコピー + { + u16 id = (u16)OS_GetLockID(); + (void)OS_LockByWord( id, &SYSMi_GetWork()->lockCardRsc, NULL ); // ARM7と排他制御する + (void)SYSMi_CopyCardRomHeader(); + (void)OS_UnlockByWord( id, &SYSMi_GetWork()->lockCardRsc, NULL ); // ARM7と排他制御する + OS_ReleaseLockID( id ); + } + s_bootTitle.titleID = *(u64 *)( &SYSM_GetCardRomHeader()->titleID_Lo ); + SYSM_SetLogoDemoSkip( s_bootTitle.flags.isLogoSkip ); + return &s_bootTitle; + }else + { + s_bootTitle.flags.isLogoSkip = TRUE; // ロゴデモを飛ばす + s_bootTitle.titleID = TITLE_ID_MACHINE_SETTINGS; + s_bootTitle.flags.bootType = LAUNCHER_BOOTTYPE_NAND; + s_bootTitle.flags.isValid = TRUE; + s_bootTitle.flags.isAppRelocate = FALSE; + s_bootTitle.flags.isAppLoadCompleted = FALSE; + return &s_bootTitle; + } +#endif //----------------------------------------------------- // TWL設定データ未入力時の初回起動シーケンス起動