ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GBA IO: Fix regression breaking keyCallbacks

This commit is contained in:
Vicki Pfau 2020-02-25 18:11:41 -08:00
parent 03d85b44d2
commit 32a515ee7f
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/gba/io.c
View File

@ -723,8 +723,7 @@ uint16_t GBAIORead(struct GBA* gba, uint32_t address) {
GBATimerUpdateRegister(gba, 3, 2); GBATimerUpdateRegister(gba, 3, 2);
break; break;
case REG_KEYINPUT: case REG_KEYINPUT: {
{
size_t c; size_t c;
for (c = 0; c < mCoreCallbacksListSize(&gba->coreCallbacks); ++c) { for (c = 0; c < mCoreCallbacksListSize(&gba->coreCallbacks); ++c) {
struct mCoreCallbacks* callbacks = mCoreCallbacksListGetPointer(&gba->coreCallbacks, c); struct mCoreCallbacks* callbacks = mCoreCallbacksListGetPointer(&gba->coreCallbacks, c);
@ -732,29 +731,28 @@ uint16_t GBAIORead(struct GBA* gba, uint32_t address) {
callbacks->keysRead(callbacks->context); callbacks->keysRead(callbacks->context);
} }
} }
} uint16_t input = 0;
uint16_t input = 0; if (gba->keyCallback) {
if (gba->keyCallback) { input = gba->keyCallback->readKeys(gba->keyCallback);
input = gba->keyCallback->readKeys(gba->keyCallback); if (gba->keySource) {
if (gba->keySource) { *gba->keySource = input;
*gba->keySource = input;
}
} else if (gba->keySource) {
input = *gba->keySource;
if (!gba->allowOpposingDirections) {
unsigned rl = input & 0x030;
unsigned ud = input & 0x0C0;
input &= 0x30F;
if (rl != 0x030) {
input |= rl;
} }
if (ud != 0x0C0) { } else if (gba->keySource) {
input |= ud; input = *gba->keySource;
if (!gba->allowOpposingDirections) {
unsigned rl = input & 0x030;
unsigned ud = input & 0x0C0;
input &= 0x30F;
if (rl != 0x030) {
input |= rl;
}
if (ud != 0x0C0) {
input |= ud;
}
} }
} }
return 0x3FF ^ input; return 0x3FF ^ input;
} }
case REG_SIOCNT: case REG_SIOCNT:
return gba->sio.siocnt; return gba->sio.siocnt;
case REG_RCNT: case REG_RCNT: