・生産工程用ランチャー向けビルドスイッチを調整

無線ファームのロードを行う。
 カードブートできない場合は、停止。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2224 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yosiokat 2008-08-22 01:51:46 +00:00
parent c29a3977cb
commit c60e1dbcf2
2 changed files with 19 additions and 5 deletions

View File

@ -118,7 +118,9 @@ void InstallFirmCallback(void* arg)
if (FALSE == OS_SendMessage(&mesq, (OSMessage)result, OS_MESSAGE_NOBLOCK))
{
// queue溢れはありえないハズだが、発生した場合は無線の不具合とみなしFATALにする。
#ifndef SYSM_BUILD_FOR_PRODUCTION_TEST
UTL_SetFatalError( FATAL_ERROR_WLANFIRM_LOAD );
#endif // SYSM_BUILD_FOR_PRODUCTION_TEST
s_isFinished = TRUE;
}
@ -378,9 +380,9 @@ BOOL InstallWlanFirmware( BOOL isHotStartWLFirm )
ROM_Header_Short *header = ( ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF;
#if defined(SYSM_DISABLE_WLFIRM_LOAD) || defined(SYSM_BUILD_FOR_PRODUCTION_TEST)
#if defined(SYSM_DISABLE_WLFIRM_LOAD)
return TRUE;
#endif // SYSM_DISABLE_WLFIRM_LOAD || SYSM_BUILD_FOR_PRODUCTION_TEST
#endif // SYSM_DISABLE_WLFIRM_LOAD
if( header->titleID_Lo[3] == '4' )
{
@ -639,8 +641,10 @@ instfirm_error:
PMi_SetWirelessLED( PM_WIRELESS_LED_OFF );
#endif
s_isFinished = TRUE;
#ifndef SYSM_BUILD_FOR_PRODUCTION_TEST
UTL_SetFatalError( FATAL_ERROR_WLANFIRM_AUTH );
#endif // SYSM_BUILD_FOR_PRODUCTION_TEST
return FALSE;
}
@ -659,9 +663,9 @@ static BOOL GetWlanFirmwareInstallResult(WLANFirmResult *pResult)
// 無線ファームロード完了?
BOOL PollingInstallWlanFirmware( void )
{
#if defined(SYSM_DISABLE_WLFIRM_LOAD) || defined(SYSM_BUILD_FOR_PRODUCTION_TEST)
#if defined(SYSM_DISABLE_WLFIRM_LOAD)
return TRUE;
#endif // SYSM_DISABLE_WLFIRM_LOAD || SYSM_BUILD_FOR_PRODUCTION_TEST
#endif // SYSM_DISABLE_WLFIRM_LOAD
if ( !s_isFinished ) {
WLANFirmResult result;
@ -674,7 +678,9 @@ BOOL PollingInstallWlanFirmware( void )
// ロード失敗
if( !s_isHotStartWLFirm ) {
// ColdStartの無線ファームロードなら、FATALエラー
#ifndef SYSM_BUILD_FOR_PRODUCTION_TEST
UTL_SetFatalError( FATAL_ERROR_WLANFIRM_LOAD );
#endif // SYSM_BUILD_FOR_PRODUCTION_TEST
#ifdef SDK_RELEASE
PMi_SetWirelessLED( PM_WIRELESS_LED_OFF );
#endif

View File

@ -412,6 +412,14 @@ void TwlMain( void )
}
}
#ifdef SYSM_BUILD_FOR_PRODUCTION_TEST
if( !pBootTitle ||
( pBootTitle && ( pBootTitle->flags.bootType != LAUNCHER_BOOTTYPE_ROM ) )
) {
state = STOP;
}
#endif // SYSM_BUILD_FOR_PRODUCTION_TEST
// チャンネルをロックする
SND_LockChannel((1 << L_CHANNEL) | (1 << R_CHANNEL), 0);