diff --git a/include/dolphin/GBAPriv.h b/include/dolphin/GBAPriv.h index 355d163c..43d23e16 100644 --- a/include/dolphin/GBAPriv.h +++ b/include/dolphin/GBAPriv.h @@ -49,7 +49,7 @@ typedef struct GBA { extern GBA __GBA[4]; extern BOOL __GBAReset; -// void __GBAHandler(s32 chan, s32 ret); +void __GBAHandler(s32 chan, u32 sr, OSContext* context); void __GBASyncCallback(s32 chan, s32 ret); s32 __GBASync(s32 chan); OSTime __GBASetDelay(s32 chan, OSTime delay); diff --git a/src/Dolphin/GBA/GBA.c b/src/Dolphin/GBA/GBA.c index 908f5d56..781596aa 100644 --- a/src/Dolphin/GBA/GBA.c +++ b/src/Dolphin/GBA/GBA.c @@ -24,7 +24,7 @@ void ShortCommandProc(s32 chan) { return; } - gba->status[0] = gba->dst[2] & 0x3a; + gba->status[0] = gba->dst[2] & GBA_JSTAT_MASK; } void GBAInit() { diff --git a/src/Dolphin/GBA/GBARead.c b/src/Dolphin/GBA/GBARead.c index 3fc58b8e..2f5a0b83 100644 --- a/src/Dolphin/GBA/GBARead.c +++ b/src/Dolphin/GBA/GBARead.c @@ -6,7 +6,7 @@ void ReadProc(s32 chan) { if (gba->result == 0) { memcpy(gba->buffer, &gba->dst, 4); - gba->status[0] = gba->_09 & 0x3a; + gba->status[0] = gba->_09 & GBA_JSTAT_MASK; } } diff --git a/src/Dolphin/GBA/GBAWrite.c b/src/Dolphin/GBA/GBAWrite.c index 3e5ad95d..c4b34d0d 100644 --- a/src/Dolphin/GBA/GBAWrite.c +++ b/src/Dolphin/GBA/GBAWrite.c @@ -8,7 +8,7 @@ void WriteProc(s32 chan) { return; } - gba->status[0] = gba->dst[0] & 0x3a; + gba->status[0] = gba->dst[0] & GBA_JSTAT_MASK; } s32 GBAWriteAsync(s32 chan, u8* src, u8* status, GBACallback callback) {