From 3b998604ee28b4bbc821b7f8044202da63312ac0 Mon Sep 17 00:00:00 2001
From: sato_masaki <sato_masaki@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 6 Jun 2008 08:26:36 +0000
Subject: [PATCH] =?UTF-8?q?-=20hyena=E3=81=A7=E3=81=AFNWM=E3=81=A7NDMA?=
 =?UTF-8?q?=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=AA=E3=81=84=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82=20-=20PollingInst?=
 =?UTF-8?q?allWlanFirmware()=E3=81=AEs=5FisFinished=E3=83=95=E3=83=A9?=
 =?UTF-8?q?=E3=82=B0=E3=81=AE=E5=88=A4=E5=AE=9A=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  -----------------------------------------------------------
  HotStart無線FWロードが失敗したときのやり直しColdStart無線FWロードで、
  ColdStartが開始された直後に無線FWロード終了を示すフラグをTRUEにしていたため、
  ColdStartが完了する前にブートしていた。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1588 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/components/hyena.TWL/src/main.c                 | 2 +-
 build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build/components/hyena.TWL/src/main.c b/build/components/hyena.TWL/src/main.c
index a9bebb29..1f29531e 100644
--- a/build/components/hyena.TWL/src/main.c
+++ b/build/components/hyena.TWL/src/main.c
@@ -71,7 +71,7 @@
 /* OS_THREAD_LAUNCHER_PRIORITY 16 */
 
 /* [TODO] �ȉ��� New WM ���Ɉڍs����ق����D�܂���? */
-#define NWM_DMANO                   NWMSP_DMA_7
+#define NWM_DMANO                   NWMSP_DMA_NOT_USE // NWM��NDMA�͎g�p���Ȃ��B
 #define THREAD_PRIO_NWM_COMMMAND    9
 #define THREAD_PRIO_NWM_EVENT       7
 #define THREAD_PRIO_NWM_SDIO        8
diff --git a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
index 67ee56fe..37fa1e04 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c
@@ -633,6 +633,7 @@ BOOL PollingInstallWlanFirmware( BOOL isStartScanWDS )
 					StartScanWDS();
 				}
 #endif // DISABLE_WDS_SCAN
+				s_isFinished = TRUE; // ����I��
 			}else {
 				// ���[�h���s
 				if( !s_isHotStartWLFirm ) {
@@ -641,14 +642,14 @@ BOOL PollingInstallWlanFirmware( BOOL isStartScanWDS )
 #ifdef SDK_RELEASE	
 					PMi_SetWirelessLED( PM_WIRELESS_LED_OFF );
 #endif
-					s_isFinished = TRUE;
+					s_isFinished = TRUE; // �ُ�I��
 				}else {
 					// �����łȂ��ꍇ�́AColdStart���[�h�ōēx���s�B
 					(void)InstallWlanFirmware( FALSE );
 					OS_TPrintf( "WLFIRM HotStart load failed... Start retry.\n" );
 				}
 			}
-			s_isFinished = TRUE;
+
 		}
 	}
 	return s_isFinished;