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

GB Video: Revert video IRQ change, disable OAM IRQ if Hblank IRQ is enabled

This commit is contained in:
Jeffrey Pfau 2016-05-20 19:04:06 -07:00
parent feb5ad2260
commit 0080fab314
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gb/video.c
View File

@ -90,7 +90,6 @@ int32_t GBVideoProcessEvents(struct GBVideo* video, int32_t cycles) {
video->nextMode -= video->eventDiff; video->nextMode -= video->eventDiff;
} }
video->nextEvent = INT_MAX; video->nextEvent = INT_MAX;
video->p->memory.io[REG_IF] &= ~(1 << GB_IRQ_LCDSTAT);
GBVideoProcessDots(video); GBVideoProcessDots(video);
if (video->nextMode <= 0) { if (video->nextMode <= 0) {
int lyc = video->p->memory.io[REG_LYC]; int lyc = video->p->memory.io[REG_LYC];
@ -105,9 +104,8 @@ int32_t GBVideoProcessEvents(struct GBVideo* video, int32_t cycles) {
if (video->ly < GB_VIDEO_VERTICAL_PIXELS) { if (video->ly < GB_VIDEO_VERTICAL_PIXELS) {
video->nextMode = GB_VIDEO_MODE_2_LENGTH; video->nextMode = GB_VIDEO_MODE_2_LENGTH;
video->mode = 2; video->mode = 2;
if (GBRegisterSTATIsOAMIRQ(video->stat)) { if (!GBRegisterSTATIsHblankIRQ(video->stat) && GBRegisterSTATIsOAMIRQ(video->stat)) {
video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT); video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT);
video->nextEvent = 4;
} }
} else { } else {
video->nextMode = GB_VIDEO_HORIZONTAL_LENGTH; video->nextMode = GB_VIDEO_HORIZONTAL_LENGTH;
@ -137,11 +135,9 @@ int32_t GBVideoProcessEvents(struct GBVideo* video, int32_t cycles) {
video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT); video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT);
} }
video->p->memory.io[REG_IF] |= (1 << GB_IRQ_VBLANK); video->p->memory.io[REG_IF] |= (1 << GB_IRQ_VBLANK);
video->nextEvent = 4;
} }
if (GBRegisterSTATIsLYCIRQ(video->stat) && lyc == video->ly) { if (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);
video->nextEvent = 4;
} }
GBUpdateIRQs(video->p); GBUpdateIRQs(video->p);
break; break;
@ -155,7 +151,6 @@ int32_t GBVideoProcessEvents(struct GBVideo* video, int32_t cycles) {
video->mode = 2; video->mode = 2;
if (GBRegisterSTATIsOAMIRQ(video->stat)) { if (GBRegisterSTATIsOAMIRQ(video->stat)) {
video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT); video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT);
video->nextEvent = 4;
GBUpdateIRQs(video->p); GBUpdateIRQs(video->p);
} }
break; break;
@ -173,7 +168,6 @@ int32_t GBVideoProcessEvents(struct GBVideo* video, int32_t cycles) {
video->stat = GBRegisterSTATSetLYC(video->stat, lyc == video->p->memory.io[REG_LY]); video->stat = GBRegisterSTATSetLYC(video->stat, lyc == video->p->memory.io[REG_LY]);
if (GBRegisterSTATIsLYCIRQ(video->stat) && lyc == video->p->memory.io[REG_LY]) { if (GBRegisterSTATIsLYCIRQ(video->stat) && lyc == video->p->memory.io[REG_LY]) {
video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT); video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT);
video->nextEvent = 4;
GBUpdateIRQs(video->p); GBUpdateIRQs(video->p);
} }
if (video->p->memory.mbcType == GB_MBC7 && video->p->memory.rotation && video->p->memory.rotation->sample) { if (video->p->memory.mbcType == GB_MBC7 && video->p->memory.rotation && video->p->memory.rotation->sample) {
@ -193,7 +187,6 @@ int32_t GBVideoProcessEvents(struct GBVideo* video, int32_t cycles) {
video->mode = 0; video->mode = 0;
if (GBRegisterSTATIsHblankIRQ(video->stat)) { if (GBRegisterSTATIsHblankIRQ(video->stat)) {
video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT); video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT);
video->nextEvent = 4;
GBUpdateIRQs(video->p); GBUpdateIRQs(video->p);
} }
if (video->ly < GB_VIDEO_VERTICAL_PIXELS && video->p->memory.isHdma && video->p->memory.io[REG_HDMA5] != 0xFF) { if (video->ly < GB_VIDEO_VERTICAL_PIXELS && video->p->memory.isHdma && video->p->memory.io[REG_HDMA5] != 0xFF) {
@ -268,7 +261,6 @@ void GBVideoWriteLCDC(struct GBVideo* video, GBRegisterLCDC value) {
video->stat = GBRegisterSTATSetLYC(video->stat, video->ly == video->p->memory.io[REG_LYC]); video->stat = GBRegisterSTATSetLYC(video->stat, video->ly == video->p->memory.io[REG_LYC]);
if (GBRegisterSTATIsLYCIRQ(video->stat) && video->ly == video->p->memory.io[REG_LYC]) { if (GBRegisterSTATIsLYCIRQ(video->stat) && video->ly == video->p->memory.io[REG_LYC]) {
video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT); video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT);
video->nextEvent = 4;
GBUpdateIRQs(video->p); GBUpdateIRQs(video->p);
} }
video->p->memory.io[REG_STAT] = video->stat; video->p->memory.io[REG_STAT] = video->stat;
@ -293,7 +285,6 @@ void GBVideoWriteSTAT(struct GBVideo* video, GBRegisterSTAT value) {
video->stat = (video->stat & 0x7) | (value & 0x78); video->stat = (video->stat & 0x7) | (value & 0x78);
if (video->p->model == GB_MODEL_DMG && video->mode == 1) { if (video->p->model == GB_MODEL_DMG && video->mode == 1) {
video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT); video->p->memory.io[REG_IF] |= (1 << GB_IRQ_LCDSTAT);
video->nextEvent = 4;
GBUpdateIRQs(video->p); GBUpdateIRQs(video->p);
} }
} }