all repos — mgba @ e61acf6218c2bb4be45075b600c8ea18631583d4

mGBA Game Boy Advance Emulator

Merge branch 'master' into optimization/idle-loop-detection
Jeffrey Pfau jeffrey@endrift.com
Tue, 27 Jan 2015 02:09:53 -0800
commit

e61acf6218c2bb4be45075b600c8ea18631583d4

parent

2dc710feeb0e36fc2179ec7c5f90b3d0430dd00c

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];