Max/mgba-ps3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GBA SIO: Fix NORMAL timing out

Browse Source
This commit is contained in:
Vicki Pfau 2024-05-24 01:32:55 -07:00
parent b572e8b09f
commit ab655db3f8
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mgba/internal/gba/sio.h
View File

@ -70,6 +70,7 @@ struct GBASIO {
uint16_t siocnt; uint16_t siocnt;
struct GBASIOPlayer gbp; struct GBASIOPlayer gbp;
struct mTimingEvent completeEvent;
}; };
void GBASIOInit(struct GBASIO* sio); void GBASIOInit(struct GBASIO* sio);

42
src/gba/sio.c
View File

@ -18,6 +18,8 @@ static const int GBASIOCyclesPerTransfer[4][MAX_GBAS] = {
{ 3140, 5755, 8376, 10486 } { 3140, 5755, 8376, 10486 }
}; };
static void _sioFinish(struct mTiming* timing, void* user, uint32_t cyclesLate);
static struct GBASIODriver* _lookupDriver(struct GBASIO* sio, enum GBASIOMode mode) { static struct GBASIODriver* _lookupDriver(struct GBASIO* sio, enum GBASIOMode mode) {
switch (mode) { switch (mode) {
case GBA_SIO_NORMAL_8: case GBA_SIO_NORMAL_8:
@ -90,10 +92,15 @@ static void _switchMode(struct GBASIO* sio) {
} }
void GBASIOInit(struct GBASIO* sio) { void GBASIOInit(struct GBASIO* sio) {
sio->drivers.normal = 0; sio->drivers.normal = NULL;
sio->drivers.multiplayer = 0; sio->drivers.multiplayer = NULL;
sio->drivers.joybus = 0; sio->drivers.joybus = NULL;
sio->activeDriver = 0; sio->activeDriver = NULL;
sio->completeEvent.context = sio;
sio->completeEvent.name = "GBA SIO Complete";
sio->completeEvent.callback = _sioFinish;
sio->completeEvent.priority = 0x80;
sio->gbp.p = sio->p; sio->gbp.p = sio->p;
GBASIOPlayerInit(&sio->gbp); GBASIOPlayerInit(&sio->gbp);
@ -239,11 +246,13 @@ void GBASIOWriteSIOCNT(struct GBASIO* sio, uint16_t value) {
value = GBASIONormalFillSi(value); value = GBASIONormalFillSi(value);
if ((value & 0x0081) == 0x0081) { if ((value & 0x0081) == 0x0081) {
if (GBASIONormalIsIrq(value)) { if (GBASIONormalIsIrq(value)) {
mTimingDeschedule(&sio->p->timing, &sio->completeEvent);
mTimingSchedule(&sio->p->timing, &sio->completeEvent, GBASIOTransferCycles(sio));
} else {
// TODO: Test this on hardware to see if this is correct // TODO: Test this on hardware to see if this is correct
GBARaiseIRQ(sio->p, GBA_IRQ_SIO, 0);
}
value = GBASIONormalClearStart(value); value = GBASIONormalClearStart(value);
} }
}
break; break;
case GBA_SIO_MULTI: case GBA_SIO_MULTI:
value = GBASIOMultiplayerFillReady(value); value = GBASIOMultiplayerFillReady(value);
@ -425,6 +434,27 @@ void GBASIONormal32FinishTransfer(struct GBASIO* sio, uint32_t data, uint32_t cy
} }
} }
static void _sioFinish(struct mTiming* timing, void* user, uint32_t cyclesLate) {
UNUSED(timing);
struct GBASIO* sio = user;
uint16_t data[4] = {0, 0, 0, 0};
switch (sio->mode) {
case GBA_SIO_MULTI:
GBASIOMultiplayerFinishTransfer(sio, data, cyclesLate);
break;
case GBA_SIO_NORMAL_8:
GBASIONormal8FinishTransfer(sio, 0, cyclesLate);
break;
case GBA_SIO_NORMAL_32:
GBASIONormal32FinishTransfer(sio, 0, cyclesLate);
break;
default:
// TODO
mLOG(GBA_SIO, STUB, "No dummy finish implemented for mode %s", _modeName(sio->mode));
break;
}
}
int GBASIOJOYSendCommand(struct GBASIODriver* sio, enum GBASIOJOYCommand command, uint8_t* data) { int GBASIOJOYSendCommand(struct GBASIODriver* sio, enum GBASIOJOYCommand command, uint8_t* data) {
switch (command) { switch (command) {
case JOY_RESET: case JOY_RESET: