エラー表示強化その2

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1482 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yoshida_teruhisa 2008-05-23 01:24:30 +00:00
parent 50265db09a
commit 5fafe40391
2 changed files with 6 additions and 4 deletions

View File

@ -86,6 +86,7 @@ static OSThread s_thread;
static OSThread s_auth_thread;
static TWLBannerFile s_bannerBuf[ LAUNCHER_TITLE_LIST_NUM ] ATTRIBUTE_ALIGN(32);
static AuthResult s_authResult = AUTH_RESULT_PROCESSING; // ROM検証結果
static AuthResult s_headerAuthResult = AUTH_RESULT_TITLE_LOAD_FAILED;
static MbAuthCode s_authcode;
@ -681,7 +682,8 @@ OS_TPrintf("RebootSystem failed: cant read file(%p, %d, %d, %d)\n", &s_authcode,
//[TODO:]この時点でヘッダの正当性検証
// ※ROMヘッダ認証
if( AUTH_RESULT_SUCCEEDED != SYSMi_AuthenticateHeader( pBootTitle, head ) )
s_headerAuthResult = SYSMi_AuthenticateHeader( pBootTitle, head );
if( AUTH_RESULT_SUCCEEDED != s_headerAuthResult )
{
goto ERROR;
}
@ -1410,7 +1412,7 @@ static void SYSMi_AuthenticateTitleThreadFunc( TitleProperty *pBootTitle )
// ロード成功?
if( SYSMi_GetWork()->flags.common.isLoadSucceeded == FALSE )
{
s_authResult = AUTH_RESULT_TITLE_LOAD_FAILED;
s_authResult = (s_headerAuthResult == AUTH_RESULT_SUCCEEDED) ? AUTH_RESULT_TITLE_LOAD_FAILED : s_headerAuthResult;
return;
}
// パラメータチェック

View File

@ -350,8 +350,8 @@ void TwlMain( void )
LauncherInit( s_titleList );
NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_NULL );
G2_ChangeBlendAlpha( 0, 31 );
PrintfSJIS( 1, 25, TXT_COLOR_RED," LAUNCHER : ERROR OCCURRED!\n" );
PrintfSJIS( 1, 40, TXT_COLOR_RED," %s",error_msg[res] );
PrintfSJIS( 1, 25, TXT_COLOR_RED,"LAUNCHER : ERROR OCCURRED!\n" );
PrintfSJIS( 1, 40, TXT_COLOR_RED,"%s",error_msg[res] );
GX_DispOn();
GXS_DispOn();
}