From 715443c3a335b7222e6225867796a07dd7f624de Mon Sep 17 00:00:00 2001
From: sato_masaki <sato_masaki@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 7 Jul 2008 09:19:57 +0000
Subject: [PATCH] =?UTF-8?q?M&M=E3=83=81=E3=83=83=E3=83=97=E3=81=AB?=
 =?UTF-8?q?=E5=AF=BE=E5=BF=9C=E3=81=95=E3=81=9B=E3=82=8B=E3=81=9F=E3=82=81?=
 =?UTF-8?q?=E3=80=81NWM=E3=81=AEFW=E3=83=AD=E3=83=BC=E3=83=89=E5=AE=8C?=
 =?UTF-8?q?=E4=BA=86=E5=BE=8C=E3=81=ABWM=E3=81=AE=E5=88=9D=E6=9C=9F?=
 =?UTF-8?q?=E5=8C=96=E3=82=92=E8=A1=8C=E3=81=86=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=80=82=20*=20TwlSDK=20r7054=E4=BB=A5?=
 =?UTF-8?q?=E9=99=8D=E3=81=AB=E5=AF=BE=E5=BF=9C?=
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@1807 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/components/hyena.TWL/src/main.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/build/components/hyena.TWL/src/main.c b/build/components/hyena.TWL/src/main.c
index f9b5ac22..1e8a63ed 100644
--- a/build/components/hyena.TWL/src/main.c
+++ b/build/components/hyena.TWL/src/main.c
@@ -25,7 +25,7 @@
 #include    <nitro/std.h>
 #include    <nitro/snd.h>
 #include    <nitro/wvr.h>
-#include    <twl/nwm.h>
+#include    <twl/nwm/ARM7/ForLauncher/nwm_sp_init_for_launcher.h>
 #include    <twl/camera.h>
 #include    <twl/rtc.h>
 #include    <nitro/hw/common/lcd.h>
@@ -233,8 +233,7 @@ TwlSpMain(void)
     // RTC 初期化
     RTC_Init(THREAD_PRIO_RTC);
 
-    // 旧無線初期化
-    WVR_Begin(wramHeapHandle);
+    // (旧無線初期化はmain loopで行う。)
 
     // SPI 初期化
     SPI_Init(THREAD_PRIO_SPI);
@@ -274,6 +273,12 @@ TwlSpMain(void)
     while (TRUE)
     {
         OS_Halt();
+        // 無線ファームのロード完了後に旧無線を初期化する。
+        if (TRUE == NWMSPi_CheckInstalledNotification())
+        {
+            WVR_Begin(wramHeapHandle);
+            NWMSPi_NotifyConfirmation();
+        }
         BOOT_WaitStart();
     }
 }
@@ -410,7 +415,7 @@ InitializeNwm(OSHeapHandle drvHeapHandle, OSHeapHandle wpaHeapHandle)
     nwmInit.wpaHeap.id = OS_ARENA_MAIN_SUBPRIV; /* [TODO] */
     nwmInit.wpaHeap.handle = wpaHeapHandle;
 
-    NWMSP_Init(&nwmInit);
+    NWMSP_InitForLauncher(&nwmInit);
 
 }
 #include    <twl/ltdwram_end.h>