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

ポーリングスレッドでのGameMode IDの照合処理を修正

Browse Source 
git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/branches/20080910_debug_dht_phase1@2490 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
(no author) 2008-09-11 07:58:30 +00:00
parent 30b148f62b
commit 62f8cf5773
1 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,6 +130,7 @@ HotSwState HOTSWi_RefreshBadBlock(u32 romMode);
static void CheckCardInsert(BOOL cardExist);
static void CheckCardPullOut(BOOL cardExist);
static void SendInsertMessage(void);
static void PulledOutSequence(void);
@ -159,6 +160,8 @@ static BOOL s_debuggerFlg;
static BOOL s_isPulledOut = TRUE;
static BOOL s_pollingThreadSleepFlg = FALSE;
static volatile BOOL s_isBusyMonitorThread;
// HMACSHA1の鍵
static u8 s_digestDefaultKey[ DIGEST_HASH_BLOCK_SIZE_SHA1 ] = {
0x21, 0x06, 0xc0, 0xde,
@ -1795,6 +1798,11 @@ static void FinalizeHotSw(HotSwCardState state)
// カード挿入検出停止
(void)OS_DisableIrqMask( HOTSW_IF_CARD_DET );
// ポーリングスレッドが動作中は待つ
while(s_isBusyMonitorThread){
OS_Sleep(1);
}
// ポーリングスレッドを消去
OS_KillThread( &HotSwThreadData.monitorThread, NULL );
@ -2089,6 +2097,8 @@ static void MonitorThread(void *arg)
OS_ReceiveMessage(&HotSwThreadData.hotswPollingCtrlQueue, (OSMessage *)&msg, OS_MESSAGE_BLOCK);
}
s_isBusyMonitorThread = TRUE;
isCardExist = HOTSW_IsCardExist();
CheckCardPullOut(isCardExist);
@ -2097,6 +2107,8 @@ static void MonitorThread(void *arg)
CheckCardInsert(isCardExist);
count = 0;
}
s_isBusyMonitorThread = FALSE;
}
}
@ -2112,15 +2124,7 @@ static void CheckCardInsert(BOOL cardExist)
if(cardExist && s_isPulledOut){
OSIntrMode enabled = OS_DisableInterrupts();
HotSwThreadData.hotswInsertMsg[HotSwThreadData.idx_insert].ctrl = FALSE;
HotSwThreadData.hotswInsertMsg[HotSwThreadData.idx_insert].value = 0;
HotSwThreadData.hotswInsertMsg[HotSwThreadData.idx_insert].type = HOTSW_INSERT;
// メッセージをキューの先頭に入れる
OS_JamMessage(&HotSwThreadData.hotswQueue, (OSMessage *)&HotSwThreadData.hotswInsertMsg[HotSwThreadData.idx_insert], OS_MESSAGE_NOBLOCK);
// メッセージインデックスをインクリメント
HotSwThreadData.idx_insert = (HotSwThreadData.idx_insert+1) % HOTSW_INSERT_MSG_NUM;
SendInsertMessage();
(void)OS_RestoreInterrupts( enabled );
}
@ -2134,7 +2138,16 @@ static void CheckCardInsert(BOOL cardExist)
ReadIDGame(&s_cbData);
if(s_cbData.id_gam != s_gameID){
OSIntrMode enabled;
McPowerOff();
enabled = OS_DisableInterrupts();
PulledOutSequence();
SendInsertMessage();
(void)OS_RestoreInterrupts( enabled );
}
// カードのロック開放(※ロックIDは開放せずに持ち続ける)
@ -2143,6 +2156,20 @@ static void CheckCardInsert(BOOL cardExist)
}
static void SendInsertMessage(void)
{
HotSwThreadData.hotswInsertMsg[HotSwThreadData.idx_insert].ctrl = FALSE;
HotSwThreadData.hotswInsertMsg[HotSwThreadData.idx_insert].value = 0;
HotSwThreadData.hotswInsertMsg[HotSwThreadData.idx_insert].type = HOTSW_INSERT;
// メッセージをキューの先頭に入れる
OS_JamMessage(&HotSwThreadData.hotswQueue, (OSMessage *)&HotSwThreadData.hotswInsertMsg[HotSwThreadData.idx_insert], OS_MESSAGE_NOBLOCK);
// メッセージインデックスをインクリメント
HotSwThreadData.idx_insert = (HotSwThreadData.idx_insert+1) % HOTSW_INSERT_MSG_NUM;
}
/*---------------------------------------------------------------------------*
Name: CheckCardPullOut