From df127afa02a7a9ecd5faf6652c3e40b0b40b175b Mon Sep 17 00:00:00 2001 From: nakasima Date: Tue, 20 May 2008 06:04:02 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=83=89=E9=9B=BB=E6=BA=90ON?= =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=B0=E3=81=AE=E7=A7=BB=E5=8B=95=E3=81=AB?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C=EF=BC=88SDKr6048=EF=BC=89=E3=80=82=20HOTSW?= =?UTF-8?q?=E7=B5=82=E4=BA=86=E5=87=A6=E7=90=86=E3=82=92=E3=82=88=E3=82=8A?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E3=81=AB=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@1421 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c index a2a744d1..4efac6a5 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c +++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c @@ -1866,6 +1866,9 @@ static void FinalizeHotSw(HotSwApliType type) } finalized = TRUE; + // カード挿入検出停止 + (void)OS_DisableIrqMask( HOTSW_IF_CARD_DET ); + // ポーリングスレッドを消去 OS_KillThread( &HotSwThreadData.monitorThread, NULL ); @@ -1908,7 +1911,7 @@ static void FinalizeHotSw(HotSwApliType type) } // NANDアプリヘッダはコピー済み - if(((ROM_Header*)SYSM_APP_ROM_HEADER_BUF)->s.game_card_on){ + if(((ROM_Header*)SYSM_APP_ROM_HEADER_BUF)->s.access_control.game_card_on){ McPowerOn(); s_cbData.modeType = HOTSW_MODE2; @@ -2060,10 +2063,10 @@ static void SendPxiMessage(HotSwCallBackType type) static void ClearCardIrq(void) { // HotSwで使っている割り込みを無効にする - (void)OS_DisableIrq(); - (void)OS_SetIrqMask( OS_GetIrqMask() & ~HOTSW_IF_CARD_DET ); + OSIntrMode irq = OS_DisableInterrupts(); + (void)OS_DisableIrqMask( HOTSW_IF_CARD_DET ); (void)OS_ResetRequestIrqMask( HOTSW_IF_CARD_DET ); - (void)OS_EnableIrq(); + (void)OS_RestoreInterrupts( irq ); }