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

GBA SIO: Fix missing interrupt on an unattached NORMAL transfer

This commit is contained in:
Vicki Pfau 2021-06-15 20:42:48 -07:00
parent 0c1dd64e5b
commit 8c3f7eb228
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -9,6 +9,7 @@ Features:
Emulation fixes: Emulation fixes:
- GB Video: Clear VRAM on reset (fixes mgba.io/i/2152) - GB Video: Clear VRAM on reset (fixes mgba.io/i/2152)
- GBA SIO: Add missing NORMAL8 implementation bits (fixes mgba.io/i/2172) - GBA SIO: Add missing NORMAL8 implementation bits (fixes mgba.io/i/2172)
- GBA SIO: Fix missing interrupt on an unattached NORMAL transfer
- GBA Video: Revert scanline latching changes (fixes mgba.io/i/2153, mgba.io/i/2149) - GBA Video: Revert scanline latching changes (fixes mgba.io/i/2153, mgba.io/i/2149)
Other fixes: Other fixes:
- 3DS: Fix disabling "wide" mode on 2DS (fixes mgba.io/i/2167) - 3DS: Fix disabling "wide" mode on 2DS (fixes mgba.io/i/2167)

15
src/gba/sio/lockstep.c
View File

@ -442,11 +442,22 @@ static void _GBASIOLockstepNodeProcessEvents(struct mTiming* timing, void* user,
struct GBASIOLockstepNode* node = user; struct GBASIOLockstepNode* node = user;
mLockstepLock(&node->p->d); mLockstepLock(&node->p->d);
int32_t cycles = 0; int32_t cycles = cycles = node->nextEvent;
node->nextEvent -= cyclesLate; node->nextEvent -= cyclesLate;
node->eventDiff += cyclesLate; node->eventDiff += cyclesLate;
if (node->p->d.attached < 2) { if (node->p->d.attached < 2) {
switch (node->mode) {
case SIO_MULTI:
cycles = GBASIOCyclesPerTransfer[GBASIOMultiplayerGetBaud(node->d.p->siocnt)][0]; cycles = GBASIOCyclesPerTransfer[GBASIOMultiplayerGetBaud(node->d.p->siocnt)][0];
break;
case SIO_NORMAL_8:
case SIO_NORMAL_32:
if (node->nextEvent <= 0) {
cycles = _masterUpdate(node);
node->eventDiff = 0;
}
break;
}
} else if (node->nextEvent <= 0) { } else if (node->nextEvent <= 0) {
if (!node->id) { if (!node->id) {
cycles = _masterUpdate(node); cycles = _masterUpdate(node);
@ -455,8 +466,6 @@ static void _GBASIOLockstepNodeProcessEvents(struct mTiming* timing, void* user,
cycles += node->p->d.useCycles(&node->p->d, node->id, node->eventDiff); cycles += node->p->d.useCycles(&node->p->d, node->id, node->eventDiff);
} }
node->eventDiff = 0; node->eventDiff = 0;
} else {
cycles = node->nextEvent;
} }
if (cycles > 0) { if (cycles > 0) {
node->nextEvent = 0; node->nextEvent = 0;