From 6127c16f17193aab5879f49faa2fe2a2407109a3 Mon Sep 17 00:00:00 2001 From: kamikawa Date: Thu, 24 Jul 2008 12:45:36 +0000 Subject: [PATCH] =?UTF-8?q?=E7=84=A1=E7=B7=9A=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=EF=BC=88=E8=A3=BD=E5=93=81=E6=8A=80?= =?UTF-8?q?=E8=A1=93=E9=83=A8=E3=81=8B=E3=82=89=E3=81=AE=E8=A6=81=E6=9C=9B?= =?UTF-8?q?=EF=BC=9A=E7=84=A1=E7=B7=9A=E3=80=80=E5=9B=BD=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=82=92=E5=8F=96=E5=BE=97=E3=81=97=E3=81=9F=E3=81=84?= =?UTF-8?q?=EF=BC=89?= 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@1990 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../NandInitializerRed/ARM7.TWL/armadillo.lsf | 4 +-- .../NandInitializerRed/ARM7.TWL/src/main.c | 33 +++++++++++++++++-- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/armadillo.lsf b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/armadillo.lsf index bdf38819..abe99fa6 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/armadillo.lsf +++ b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/armadillo.lsf @@ -69,8 +69,8 @@ Ltdautoload SCRWRAM Library libnvram_sp$(LIBSUFFIX).a Library librtc_sp$(LIBSUFFIX).a Library libfatfs_sp$(LIBSUFFIX).a -# Library libwm_sp$(LIBSUFFIX).a -# Library libnwm_sp$(LIBSUFFIX).a + Library libwm_sp$(LIBSUFFIX).a + Library libnwm_sp$(LIBSUFFIX).a Library libwvr_sp$(LIBSUFFIX).a Library libwl_sp$(LIBSUFFIX).a Library libwpa_sp$(LIBSUFFIX).a diff --git a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/src/main.c b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/src/main.c index f240bd4a..d2c00987 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/src/main.c +++ b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/src/main.c @@ -75,6 +75,7 @@ static void PrintDebugInfo(void); static OSHeapHandle InitializeAllocateSystem(void); static void InitializeFatfs(void); +static void InitializeNwm(OSHeapHandle hh); static void InitializeCardPower(void); static void InitializeCdc(void); static void DummyThread(void* arg); @@ -130,7 +131,7 @@ TwlSpMain(void) FS_Init(FS_DMA_NOT_USE); // FS for CARD FS_CreateReadServerThread(THREAD_PRIO_FS); // FS for CARD InitializeFatfs(); // FAT-FS -// InitializeNwm(heapHandle); // TWL 無線 + InitializeNwm(heapHandle); // TWL 無線 MCU_InitIrq(THREAD_PRIO_MCU); // マイコン if (OSi_IsCodecTwlMode() == TRUE) @@ -142,7 +143,7 @@ TwlSpMain(void) SND_Init(THREAD_PRIO_SND); // サウンド SNDEX_Init(THREAD_PRIO_SNDEX); // サウンド拡張 RTC_Init(THREAD_PRIO_RTC); // RTC -// WVR_Begin(heapHandle); // NITRO 無線 + WVR_Begin(heapHandle); // NITRO 無線 SPI_Init(THREAD_PRIO_SPI); InitializeCardPower(); // カード電源ON（検査プログラム用） @@ -251,6 +252,34 @@ InitializeFatfs(void) OS_KillThread(&thread, NULL); } +/*---------------------------------------------------------------------------* + Name: InitializeNwm + Description: NWMライブラリを初期化する。 + Arguments: hh - 利用可能なヒープのハンドルを指定。 + Returns: None. + *---------------------------------------------------------------------------*/ +static void +InitializeNwm(OSHeapHandle hh) +{ + NwmspInit nwmInit; + + /* [TODO] 確保しているヒープ領域が新無線一式が必要としているメモリ量以上かのチェックが必要 */ + + nwmInit.cmdPrio = THREAD_PRIO_NWM_COMMAND; + nwmInit.evtPrio = THREAD_PRIO_NWM_EVENT; + nwmInit.sdioPrio = THREAD_PRIO_NWM_SDIO; + + nwmInit.dmaNo = DMA_NO_NWM; + nwmInit.drvHeap.id = OS_ARENA_WRAM_SUBPRIV; + nwmInit.drvHeap.handle = hh; + + nwmInit.wpaPrio = THREAD_PRIO_NWM_WPA; + nwmInit.wpaHeap.id = OS_ARENA_WRAM_SUBPRIV; + nwmInit.wpaHeap.handle = hh; + + NWMSP_Init(&nwmInit); +} + /*---------------------------------------------------------------------------* Name: InitializeCardPower Description: カード電源をONする。