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

Merge branch 'master' into optimization/idle-loop-detection

This commit is contained in:
Jeffrey Pfau 2015-01-27 02:09:53 -08:00
parent 2dc710feeb 6d08ed3dd8
commit e61acf6218
2 changed files with 2 additions and 2 deletions

2
src/gba/gba-io.c
View File

@ -297,7 +297,7 @@ void GBAIOWrite(struct GBA* gba, uint32_t address, uint16_t value) {
case REG_DISPSTAT: case REG_DISPSTAT:
value &= 0xFFF8; value &= 0xFFF8;
GBAVideoWriteDISPSTAT(&gba->video, value); GBAVideoWriteDISPSTAT(&gba->video, value);
break; return;
// Audio // Audio
case REG_SOUND1CNT_LO: case REG_SOUND1CNT_LO:

2
src/gba/gba-video.c
View File

@ -169,7 +169,7 @@ int32_t GBAVideoProcessEvents(struct GBAVideo* video, int32_t cycles) {
void GBAVideoWriteDISPSTAT(struct GBAVideo* video, uint16_t value) { void GBAVideoWriteDISPSTAT(struct GBAVideo* video, uint16_t value) {
video->p->memory.io[REG_DISPSTAT >> 1] &= 0x7; video->p->memory.io[REG_DISPSTAT >> 1] &= 0x7;
video->p->memory.io[REG_DISPSTAT >> 1] |= value & 0xFFF8; video->p->memory.io[REG_DISPSTAT >> 1] |= value;
uint16_t dispstat = video->p->memory.io[REG_DISPSTAT >> 1]; uint16_t dispstat = video->p->memory.io[REG_DISPSTAT >> 1];