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

GB Video: Hblank IRQs should mask LYC=LY IRQs (fixes #466)

This commit is contained in:
Jeffrey Pfau 2016-12-23 17:11:19 -08:00
parent 2bd8dd2fa2
commit eaec17488e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -42,6 +42,7 @@ Bugfixes:
- GB Video: Initialize LCDC in renderer - GB Video: Initialize LCDC in renderer
- GBA I/O: Mask off WAITCNT bits that cannot be written - GBA I/O: Mask off WAITCNT bits that cannot be written
- GB Memory: Fix HDMA5 value after DMA completes - GB Memory: Fix HDMA5 value after DMA completes
- GB Video: Hblank IRQs should mask LYC=LY IRQs
Misc: Misc:
- SDL: Remove scancode key input - SDL: Remove scancode key input
- GBA Video: Clean up unused timers - GBA Video: Clean up unused timers

2
src/gb/video.c
View File

@ -138,7 +138,7 @@ int32_t GBVideoProcessEvents(struct GBVideo* video, int32_t cycles) {
callbacks->videoFrameEnded(callbacks->context); callbacks->videoFrameEnded(callbacks->context);
} }
} }
if (GBRegisterSTATIsLYCIRQ(video->stat) && lyc == video->ly) { if (!GBRegisterSTATIsHblankIRQ(video->stat) && GBRegisterSTATIsLYCIRQ(video->stat) && lyc == video->ly) {
video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT); video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT);
} }
GBUpdateIRQs(video->p); GBUpdateIRQs(video->p);