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 
HotSwのFinalize仕様変更に伴い、変数名を修正。


git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1849 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
(no author) 2008-07-11 02:46:35 +00:00
parent efbc717c4d
commit d0132423ba
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ static BOOL isTwlModeLoad(void);
static HotSwState ReadSecureModeCardData(void); static HotSwState ReadSecureModeCardData(void);
static void ClearCardFlgs(void); static void ClearCardFlgs(void);
static void FinalizeHotSw(HotSwCardState type); static void FinalizeHotSw(HotSwCardState state);
static void ForceNitroModeToFinalize(void); static void ForceNitroModeToFinalize(void);
static void ForceNormalModeToFinalize(void); static void ForceNormalModeToFinalize(void);
static BOOL ChangeGameMode(void); static BOOL ChangeGameMode(void);
@ -1563,7 +1563,7 @@ static void HotSwThread(void *arg)
} }
if( msg->finalize == TRUE && msg->ctrl == FALSE) { if( msg->finalize == TRUE && msg->ctrl == FALSE) {
FinalizeHotSw( msg->apli ); FinalizeHotSw( msg->state );
} }
#ifdef USE_WRAM_LOAD #ifdef USE_WRAM_LOAD
@ -2101,17 +2101,17 @@ static void InterruptCallbackPxi(PXIFifoTag tag, u32 data, BOOL err)
#ifndef USE_WRAM_LOAD #ifndef USE_WRAM_LOAD
OS_TPrintf("... Pxi Message - value:%x ctrl:%x finalize:%x bootType:%x\n", OS_TPrintf("... Pxi Message - value:%x ctrl:%x finalize:%x bootType:%x\n",
d.msg.value, d.msg.ctrl, d.msg.finalize, d.msg.bootType); d.msg.value, d.msg.ctrl, d.msg.finalize, d.msg.cardState);
#else #else
OS_TPrintf("... Pxi Message - value:%x ctrl:%x finalize:%x read:%x bootType:%x\n", OS_TPrintf("... Pxi Message - value:%x ctrl:%x finalize:%x read:%x bootType:%x\n",
d.msg.value, d.msg.ctrl, d.msg.finalize, d.msg.read, d.msg.bootType); d.msg.value, d.msg.ctrl, d.msg.finalize, d.msg.read, d.msg.cardState);
HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].read = (d.msg.read) ? TRUE : FALSE; HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].read = (d.msg.read) ? TRUE : FALSE;
#endif #endif
HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].ctrl = (d.msg.ctrl) ? TRUE : FALSE; HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].ctrl = (d.msg.ctrl) ? TRUE : FALSE;
HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].finalize = (d.msg.finalize) ? TRUE : FALSE; HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].finalize = (d.msg.finalize) ? TRUE : FALSE;
HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].value = d.msg.value; HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].value = d.msg.value;
HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].apli = (HotSwCardState)d.msg.bootType; HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl].state = (HotSwCardState)d.msg.cardState;
// ƒ<>ƒbƒZ<C692>[ƒW‘—<E28098>M // ƒ<>ƒbƒZ<C692>[ƒW‘—<E28098>M
OS_SendMessage(&HotSwThreadData.hotswQueue, (OSMessage *)&HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl], OS_MESSAGE_NOBLOCK); OS_SendMessage(&HotSwThreadData.hotswQueue, (OSMessage *)&HotSwThreadData.hotswPxiMsg[HotSwThreadData.idx_ctrl], OS_MESSAGE_NOBLOCK);

4
build/libraries_sysmenu/hotsw/ARM9/src/hotsw_ctrl.c
View File

@ -181,7 +181,7 @@ void HOTSW_InvalidHotSW( void )
Description: PXI通信でARM7に活線挿抜Finalize処理を通知 Description: PXI通信でARM7に活線挿抜Finalize処理を通知
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void HOTSW_FinalizeHotSWAsync( HotSwCardState apliType ) void HOTSW_FinalizeHotSWAsync( HotSwCardState cardState )
{ {
HotSwPxiMessageForArm7 msg; HotSwPxiMessageForArm7 msg;
@ -189,7 +189,7 @@ void HOTSW_FinalizeHotSWAsync( HotSwCardState apliType )
msg.msg.finalize = TRUE; msg.msg.finalize = TRUE;
msg.msg.ctrl = FALSE; msg.msg.ctrl = FALSE;
msg.msg.bootType = (u8)apliType; msg.msg.cardState= (u8)cardState;
while (PXI_SendWordByFifo(PXI_FIFO_TAG_HOTSW, msg.data, FALSE) != PXI_FIFO_SUCCESS) while (PXI_SendWordByFifo(PXI_FIFO_TAG_HOTSW, msg.data, FALSE) != PXI_FIFO_SUCCESS)
{ {

14
include/sysmenu/hotsw/common/hotsw.h
View File

@ -51,11 +51,11 @@ typedef enum HotSwCardState{
// PXI用メッセージ // PXI用メッセージ
typedef union HotSwPxiMessageForArm7{ typedef union HotSwPxiMessageForArm7{
struct { struct {
u32 value :1; u32 value :1;
u32 ctrl :1; u32 ctrl :1;
u32 finalize:1; u32 finalize :1;
u32 read :1; u32 read :1;
u32 bootType:8; u32 cardState:8;
u32 :20; u32 :20;
} msg; } msg;
u32 data; u32 data;
@ -81,7 +81,7 @@ typedef struct HotSwMessageForArm7{
BOOL finalize; BOOL finalize;
BOOL read; BOOL read;
HotSwMessageType type; HotSwMessageType type;
HotSwCardState apli; HotSwCardState state;
} HotSwMessageForArm7; } HotSwMessageForArm7;
typedef struct HotSwMessageForArm9{ typedef struct HotSwMessageForArm9{
@ -109,7 +109,7 @@ void HOTSW_InvalidHotSWAsync( void );
void HOTSW_InvalidHotSW( void ); void HOTSW_InvalidHotSW( void );
// PXI通信でARM7に活線挿抜Finalize処理を通知 // PXI通信でARM7に活線挿抜Finalize処理を通知
void HOTSW_FinalizeHotSWAsync( HotSwCardState apliType ); void HOTSW_FinalizeHotSWAsync( HotSwCardState cardState );
// 活線挿抜の許可/抑制の状態を返す // 活線挿抜の許可/抑制の状態を返す
BOOL HOTSW_isEnableHotSW(void); BOOL HOTSW_isEnableHotSW(void);