From 87902441b558f4dbdee05a258f620c821e9f22f5 Mon Sep 17 00:00:00 2001 From: nakasima Date: Thu, 13 Dec 2007 02:45:39 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=96=E3=83=BC=E3=83=88=E6=99=82=E3=81=AE?= =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=83=9E=E3=82=A6=E3=83=B3=E3=83=88=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=81=AE=E8=BF=BD=E5=8A=A0=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@357 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/boot/ARM7/Makefile | 4 +++- build/libraries_sysmenu/boot/ARM7/src/bootAPI.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/build/libraries_sysmenu/boot/ARM7/Makefile b/build/libraries_sysmenu/boot/ARM7/Makefile index ce1c3afe..8382f798 100644 --- a/build/libraries_sysmenu/boot/ARM7/Makefile +++ b/build/libraries_sysmenu/boot/ARM7/Makefile @@ -28,7 +28,9 @@ TWL_PROC = ARM7 SRCDIR = ./src -INCDIR = ../common/include +INCDIR = ../common/include \ + $(TWLSDK_ROOT)/build/libraries/fatfs/ARM7.TWL/include \ + $(TWLSDK_ROOT)/build/libraries/fatfs/ARM7.TWL/include/twl/fatfs/ARM7 \ SRCS = bootAPI.c boot.c diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c index c6c1e4d0..58aec796 100644 --- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c +++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include #include "reboot.h" @@ -54,6 +56,14 @@ void BOOT_Init( void ) BOOL BOOT_WaitStart( void ) { + char drv; + + // unmount drives + for ( drv = 'A'; drv <= 'Z'; drv++ ) + { + rtfs_detach( drv ); + } + if( (reg_PXI_MAINPINTF & 0x000f ) == 0x000f ) { (void)OS_DisableIrq(); // ここで割り込み禁止にしないとダメ。 (void)OS_SetIrqMask(0); // SDKバージョンのサーチに時間がかかると、ARM9がHALTにかかってしまい、ARM7のサウンドスレッドがARM9にFIFOでデータ送信しようとしてもFIFOが一杯で送信できない状態で無限ループに入ってしまう。