all repos — mgba @ 6d08ed3dd8e447a5ecbc7946ae1fda8aa5076d5d

mGBA Game Boy Advance Emulator

GBA Video: Fix DISPSTAT write after refactor
Jeffrey Pfau jeffrey@endrift.com
Tue, 27 Jan 2015 02:09:41 -0800
commit

6d08ed3dd8e447a5ecbc7946ae1fda8aa5076d5d

parent

e85e8968f254f74df6c3f6baf1ac60788381aa7b

2 files changed, 2 insertions(+), 2 deletions(-)

jump to
M src/gba/gba-io.c → src/gba/gba-io.c 
@@ -297,7 +297,7 @@ // Video
 		case REG_DISPSTAT:
 			value &= 0xFFF8;
 			GBAVideoWriteDISPSTAT(&gba->video, value);
-			break;
+			return;
 
 		// Audio
 		case REG_SOUND1CNT_LO:
M src/gba/gba-video.c → src/gba/gba-video.c 
@@ -169,7 +169,7 @@ }
 
 void GBAVideoWriteDISPSTAT(struct GBAVideo* video, uint16_t value) {
 	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];