From c60e1dbcf2ceff67067e99afb2b3ea90857947e7 Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 22 Aug 2008 01:51:46 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=BB=E7=94=9F=E7=94=A3=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E7=94=A8=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC=E5=90=91?=
 =?UTF-8?q?=E3=81=91=E3=83=93=E3=83=AB=E3=83=89=E3=82=B9=E3=82=A4=E3=83=83?=
 =?UTF-8?q?=E3=83=81=E3=82=92=E8=AA=BF=E6=95=B4=20=E3=80=80=E7=84=A1?=
 =?UTF-8?q?=E7=B7=9A=E3=83=95=E3=82=A1=E3=83=BC=E3=83=A0=E3=81=AE=E3=83=AD?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E3=82=92=E8=A1=8C=E3=81=86=E3=80=82=20?=
 =?UTF-8?q?=E3=80=80=E3=82=AB=E3=83=BC=E3=83=89=E3=83=96=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AF?=
 =?UTF-8?q?=E3=80=81=E5=81=9C=E6=AD=A2=E3=80=82?=
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@2224 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../Launcher/ARM9/src/loadWlanFirm.c             | 16 +++++++++++-----
 build/systemMenu_RED/Launcher/ARM9/src/main.c    |  8 ++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
index 20b44727..84b87b82 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
@@ -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
diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c
index 1a575606..f2ae9957 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/main.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c
@@ -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);