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

GB SIO: Some fixes

This commit is contained in:
Jeffrey Pfau 2016-12-26 12:03:23 -08:00
parent ceea51b55e
commit 269b18d8aa
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gb/sio.c
View File

@ -61,14 +61,20 @@ void GBSIOSetDriver(struct GBSIO* sio, struct GBSIODriver* driver) {
void _GBSIOProcessEvents(struct mTiming* timing, void* context, uint32_t cyclesLate) {
UNUSED(cyclesLate);
struct GBSIO* sio = context;
--sio->remainingBits;
sio->p->memory.io[REG_SB] &= ~(8 >> sio->remainingBits);
sio->p->memory.io[REG_SB] |= sio->pendingSB & ~(8 >> sio->remainingBits);
bool doIRQ = false;
if (sio->remainingBits) {
doIRQ = true;
--sio->remainingBits;
sio->p->memory.io[REG_SB] &= ~(128 >> sio->remainingBits);
sio->p->memory.io[REG_SB] |= sio->pendingSB & (128 >> sio->remainingBits);
}
if (!sio->remainingBits) {
sio->p->memory.io[REG_IF] |= (1 << GB_IRQ_SIO);
sio->p->memory.io[REG_SC] = GBRegisterSCClearEnable(sio->p->memory.io[REG_SC]);
sio->pendingSB = 0xFF;
GBUpdateIRQs(sio->p);
if (doIRQ) {
sio->p->memory.io[REG_IF] |= (1 << GB_IRQ_SIO);
GBUpdateIRQs(sio->p);
sio->pendingSB = 0xFF;
}
} else {
mTimingSchedule(timing, &sio->event, sio->period);
}
@ -85,8 +91,10 @@ void GBSIOWriteSC(struct GBSIO* sio, uint8_t sc) {
sio->period = GBSIOCyclesPerTransfer[GBRegisterSCGetClockSpeed(sc)]; // TODO Shift Clock
if (GBRegisterSCIsEnable(sc)) {
mTimingDeschedule(&sio->p->timing, &sio->event);
mTimingSchedule(&sio->p->timing, &sio->event, sio->period);
sio->remainingBits = 8;
if (GBRegisterSCIsShiftClock(sc)) {
mTimingSchedule(&sio->p->timing, &sio->event, sio->period);
sio->remainingBits = 8;
}
}
if (sio->driver) {
sio->driver->writeSC(sio->driver, sc);

7
src/gb/sio/lockstep.c
View File

@ -8,7 +8,7 @@
#include "gb/gb.h"
#include "gb/io.h"
#define LOCKSTEP_INCREMENT 500
#define LOCKSTEP_INCREMENT 512
static bool GBSIOLockstepNodeInit(struct GBSIODriver* driver);
static void GBSIOLockstepNodeDeinit(struct GBSIODriver* driver);
@ -90,6 +90,11 @@ static void _finishTransfer(struct GBSIOLockstepNode* node) {
}
struct GBSIO* sio = node->d.p;
sio->pendingSB = node->p->pendingSB[!node->id];
if (GBRegisterSCIsEnable(sio->p->memory.io[REG_SC])) {
sio->remainingBits = 8;
mTimingDeschedule(&sio->p->timing, &sio->event);
mTimingSchedule(&sio->p->timing, &sio->event, 0);
}
node->transferFinished = true;
#ifndef NDEBUG
++node->transferId;