rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

(更新:Akabane Jumpei)

Browse Source 
DSテレビ対策。カード抜け検出は、抜け割り込みを使わずに、ポーリングでカード状態監視するように変更。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1397 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
(no author) 2008-05-19 06:45:01 +00:00
parent 6a8a6e02cc
commit e00d081cbf
1 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
View File

@ -73,9 +73,7 @@ static void SetInterruptCallback( OSIrqMask intr_bit, OSIrqFunction func );
static void SetInterruptCallbackEx( OSIrqMask intr_bit, void *func ); static void SetInterruptCallbackEx( OSIrqMask intr_bit, void *func );
static void SetInterrupt(void); static void SetInterrupt(void);
static void InterruptCallbackCard(void);
static void InterruptCallbackCardDet(void); static void InterruptCallbackCardDet(void);
static void InterruptCallbackNDma(void);
static void InterruptCallbackPxi(PXIFifoTag tag, u32 data, BOOL err); static void InterruptCallbackPxi(PXIFifoTag tag, u32 data, BOOL err);
static void LockHotSwRsc(OSLockWord* word); static void LockHotSwRsc(OSLockWord* word);
@ -2174,6 +2172,16 @@ static void MonitorThread(void *arg)
// –{“–‚Í”²‚¯‚Ä‚½<E2809A>ê<EFBFBD>‡ // –{“–‚Í”²‚¯‚Ä‚½<E2809A>ê<EFBFBD>‡
if(isPullOutNow){ if(isPullOutNow){
#ifndef HOTSW_DISABLE_FORCE_CARD_OFF
{
u32 mode = GetMcSlotMode();
if(mode == SLOT_STATUS_MODE_01 || mode == SLOT_STATUS_MODE_10){
SetMcSlotMode(SLOT_STATUS_MODE_11);
}
OS_TPrintf("slot status: %x\n", mode);
}
#endif
HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].ctrl = FALSE; HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].ctrl = FALSE;
HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].value = 0; HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].value = 0;
HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].type = HOTSW_PULLOUT; HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].type = HOTSW_PULLOUT;
@ -2208,40 +2216,6 @@ static void MonitorThread(void *arg)
} }
/*---------------------------------------------------------------------------*
Name: InterruptCallbackCard
Description: カードB抜け割り込みハンドラ
*---------------------------------------------------------------------------*/
static void InterruptCallbackCard(void)
{
// スロット電源ON時は強制OFF
// （エミュレーションROMは旧コネクタでの強制OFFでデータが化けることがある）
#ifndef HOTSW_DISABLE_FORCE_CARD_OFF
// if ( ! HOTSWi_IsRomEmulation() )
{
u32 mode = GetMcSlotMode();
if(mode == SLOT_STATUS_MODE_01 || mode == SLOT_STATUS_MODE_10){
SetMcSlotMode(SLOT_STATUS_MODE_11);
}
OS_TPrintf("slot status: %x\n", mode);
}
#endif
HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].ctrl = FALSE;
HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].value = 0;
HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut].type = HOTSW_PULLOUT;
// メッセージ送信
OS_SendMessage(&HotSwThreadData.hotswQueue, (OSMessage *)&HotSwThreadData.hotswPulledOutMsg[HotSwThreadData.idx_pulledOut], OS_MESSAGE_NOBLOCK);
// メッセージインデックスをインクリメント
HotSwThreadData.idx_pulledOut = (HotSwThreadData.idx_pulledOut+1) % HOTSW_PULLED_MSG_NUM;
OS_PutString("○\n");
}
/*---------------------------------------------------------------------------* /*---------------------------------------------------------------------------*
Name: InterruptCallbackCardDet Name: InterruptCallbackCardDet
@ -2400,10 +2374,8 @@ static void SetInterruptCallbackEx( OSIrqMask intr_bit, void *func )
static void SetInterrupt(void) static void SetInterrupt(void)
{ {
#ifndef DEBUG_USED_CARD_SLOT_B_ #ifndef DEBUG_USED_CARD_SLOT_B_
SetInterruptCallback( OS_IE_CARD_A_IREQ , InterruptCallbackCard );
SetInterruptCallback( OS_IE_CARD_A_DET , InterruptCallbackCardDet ); SetInterruptCallback( OS_IE_CARD_A_DET , InterruptCallbackCardDet );
#else #else
SetInterruptCallback( OS_IE_CARD_B_IREQ , InterruptCallbackCard );
SetInterruptCallback( OS_IE_CARD_B_DET , InterruptCallbackCardDet ); SetInterruptCallback( OS_IE_CARD_B_DET , InterruptCallbackCardDet );
#endif #endif