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

DS Slot-1: Detect Flash

This commit is contained in:
Vicki Pfau 2017-02-23 10:50:42 -08:00
parent bd80056758
commit d10ed92c56
1 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/ds/slot1.c
View File

@ -147,6 +147,11 @@ static uint8_t _slot1SPIAutodetect(struct DSCommon* dscore, uint8_t datum) {
dscore->p->memory.slot1.spiAddress |= datum; dscore->p->memory.slot1.spiAddress |= datum;
dscore->p->memory.slot1.spiAddressingRemaining -= 8; dscore->p->memory.slot1.spiAddressingRemaining -= 8;
return 0xFF; return 0xFF;
} else if (dscore->p->memory.slot1.spiAddress & 1) {
dscore->p->memory.slot1.spiAddress <<= 8;
dscore->p->memory.slot1.spiAddress |= datum;
dscore->p->memory.slot1.savedataType = DS_SAVEDATA_FLASH;
return 0xFF;
} else { } else {
if (!_slot1GuaranteeSize(&dscore->p->memory.slot1)) { if (!_slot1GuaranteeSize(&dscore->p->memory.slot1)) {
return 0xFF; return 0xFF;
@ -164,6 +169,34 @@ static uint8_t _slot1SPIAutodetect(struct DSCommon* dscore, uint8_t datum) {
return 0xFF; return 0xFF;
} }
static uint8_t _slot1SPIFlash(struct DSCommon* dscore, uint8_t datum) {
DSSlot1AUXSPICNT control = dscore->memory.io[DS_REG_AUXSPICNT >> 1];
if (dscore->p->memory.slot1.spiAddressingRemaining) {
dscore->p->memory.slot1.spiAddress <<= 8;
dscore->p->memory.slot1.spiAddress |= datum;
dscore->p->memory.slot1.spiAddressingRemaining -= 8;
return 0xFF;
} else {
if (!_slot1GuaranteeSize(&dscore->p->memory.slot1)) {
return 0xFF;
}
}
switch (dscore->p->memory.slot1.spiCommand) {
case 0x03: // RD
return dscore->p->memory.slot1.spiData[dscore->p->memory.slot1.spiAddress++];
case 0x02: // WR
dscore->p->memory.slot1.spiData[dscore->p->memory.slot1.spiAddress] = datum;
++dscore->p->memory.slot1.spiAddress;
break;
default:
mLOG(DS_SLOT1, STUB, "Unimplemented SPI Flash write: %04X:%02X:%02X", control, dscore->p->memory.slot1.spiCommand, datum);
break;
}
return 0xFF;
}
static void _slot1SPI(struct mTiming* timing, void* context, uint32_t cyclesLate) { static void _slot1SPI(struct mTiming* timing, void* context, uint32_t cyclesLate) {
UNUSED(timing); UNUSED(timing);
UNUSED(cyclesLate); UNUSED(cyclesLate);
@ -179,7 +212,14 @@ static void _slot1SPI(struct mTiming* timing, void* context, uint32_t cyclesLate
dscore->p->memory.slot1.savedataType = DS_SAVEDATA_EEPROM512; dscore->p->memory.slot1.savedataType = DS_SAVEDATA_EEPROM512;
} }
dscore->p->memory.slot1.spiAddress = 0; dscore->p->memory.slot1.spiAddress = 0;
switch (dscore->p->memory.slot1.savedataType) {
case DS_SAVEDATA_FLASH:
dscore->p->memory.slot1.spiAddressingRemaining = 24;
break;
default:
dscore->p->memory.slot1.spiAddressingRemaining = 16; dscore->p->memory.slot1.spiAddressingRemaining = 16;
break;
}
} else { } else {
switch (dscore->p->memory.slot1.spiCommand) { switch (dscore->p->memory.slot1.spiCommand) {
case 0x04: // WRDI case 0x04: // WRDI
@ -196,6 +236,9 @@ static void _slot1SPI(struct mTiming* timing, void* context, uint32_t cyclesLate
case DS_SAVEDATA_AUTODETECT: case DS_SAVEDATA_AUTODETECT:
newValue = _slot1SPIAutodetect(dscore, oldValue); newValue = _slot1SPIAutodetect(dscore, oldValue);
break; break;
case DS_SAVEDATA_FLASH:
newValue = _slot1SPIFlash(dscore, oldValue);
break;
default: default:
mLOG(DS_SLOT1, STUB, "Unimplemented SPI write: %04X:%02X", control, oldValue); mLOG(DS_SLOT1, STUB, "Unimplemented SPI write: %04X:%02X", control, oldValue);
break; break;