カードブート専用TitleIDが渡されたら即カードブートする

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/branches/20100611_RedLauncher_Remodel@2919 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
N2614 2010-06-11 06:28:04 +00:00
parent d936ac2acb
commit 8b31c65255

View File

@ -25,7 +25,7 @@
// define data-----------------------------------------------------------------
#define SYSM_PM_RETRY_NUM 5 // PMリトライ回数
#define TITLE_ID_CARD_BOOT 0x0004800000000000 // ƒJ<C692>[ƒhƒu<C692>[ƒg
// extern data-----------------------------------------------------------------
extern void LCFG_VerifyAndRecoveryNTRSettings( void );
@ -36,6 +36,7 @@ static TitleProperty *SYSMi_CheckShortcutBoot1( void );
static TitleProperty *SYSMi_CheckShortcutBoot2( void );
void SYSMi_SendKeysToARM7( void );
static OSTitleId SYSMi_getTitleIdOfMachineSettings( void );
static TitleProperty * SYSMi_ShortcutCardBootSub( void );
// global variable-------------------------------------------------------------
void *(*SYSMi_Alloc)( u32 size );
@ -302,11 +303,13 @@ TitleProperty *SYSM_ReadParameters( void )
// ホットスタート時は、基本ロゴデモスキップ
SYSM_SetLogoDemoSkip( TRUE );
#if 0
if( !SYSM_IsRunOnDebugger() && LCFG_TSD_GetLastTimeBootSoftPlatform() == PLATFORM_CODE_NTR ) {
// 前回ブートがNTRなら、ランチャーパラメータ無効
SYSM_SetValidLauncherParam(FALSE);
MI_CpuClear32( &SYSMi_GetWork()->launcherParam, sizeof(LauncherParam) );
}
#endif
if( SYSMi_GetWork()->flags.arm7.isValidLauncherParam ) {
// ロゴデモスキップ無効?
@ -316,10 +319,17 @@ TitleProperty *SYSM_ReadParameters( void )
// アプリ直接起動の指定があったらロゴデモを飛ばして指定アプリ起動
if( SYSM_GetLauncherParamBody()->v1.bootTitleID ) {
s_bootTitleBuf.titleID = SYSM_GetLauncherParamBody()->v1.bootTitleID;
s_bootTitleBuf.flags = SYSM_GetLauncherParamBody()->v1.flags;
s_bootTitleBuf.pBanner = (TWLBannerFile *)(*(TWLBannerFile **)(SYSM_GetLauncherParamBody()->v1.rsv));
pBootTitle = &s_bootTitleBuf;
if(SYSM_GetLauncherParamBody()->v1.bootTitleID != TITLE_ID_CARD_BOOT)
{
s_bootTitleBuf.titleID = SYSM_GetLauncherParamBody()->v1.bootTitleID;
s_bootTitleBuf.flags = SYSM_GetLauncherParamBody()->v1.flags;
s_bootTitleBuf.pBanner = (TWLBannerFile *)(*(TWLBannerFile **)(SYSM_GetLauncherParamBody()->v1.rsv));
pBootTitle = &s_bootTitleBuf;
}
else
{
pBootTitle = SYSMi_ShortcutCardBootSub();
}
}
}
}