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

GBA Hardware: Fix GPIO on big endian

This commit is contained in:
Jeffrey Pfau 2015-12-29 00:03:42 -05:00
parent b20cda21e1
commit dd91b689a2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -18,6 +18,7 @@ Bugfixes:
- ARM7: Fix sign of unaligned LDRSH
- GBA: Fix warnings when creating and loading savestates
- GBA Memory: Fix DMAs triggering two cycles early
- GBA Hardware: Fix GPIO on big endian
Misc:
- Qt: Window size command line options are now supported
- Qt: Increase usability of key mapper

11
src/gba/hardware.c
View File

@ -87,9 +87,11 @@ void GBAHardwareGPIOWrite(struct GBACartridgeHardware* hw, uint32_t address, uin
GBALog(hw->p, GBA_LOG_WARN, "Invalid GPIO address");
}
if (hw->readWrite) {
uint16_t old = hw->gpioBase[0];
uint16_t old;
LOAD_16(old, 0, hw->gpioBase);
old &= ~hw->direction;
hw->gpioBase[0] = old | hw->pinState;
old |= hw->pinState;
STORE_16(old, 0, hw->gpioBase);
} else {
hw->gpioBase[0] = 0;
}
@ -129,10 +131,11 @@ void _readPins(struct GBACartridgeHardware* hw) {
void _outputPins(struct GBACartridgeHardware* hw, unsigned pins) {
if (hw->readWrite) {
uint16_t old = hw->gpioBase[0];
uint16_t old;
LOAD_16(old, 0, hw->gpioBase);
old &= hw->direction;
hw->pinState = old | (pins & ~hw->direction & 0xF);
hw->gpioBase[0] = hw->pinState;
STORE_16(hw->pinState, 0, hw->gpioBase);
}
}