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: Correct size and error check SPI

This commit is contained in:
Vicki Pfau 2017-04-12 01:15:39 -07:00
parent 5bb811a16e
commit a688e62123
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ds/slot1.c
View File

@ -230,6 +230,9 @@ static uint8_t _slot1SPIAutodetect(struct DSCommon* dscore, uint8_t datum) {
return 0xFF; return 0xFF;
} }
} }
if (!dscore->p->memory.slot1.spiData) {
return 0xFF;
}
switch (dscore->p->memory.slot1.spiCommand) { switch (dscore->p->memory.slot1.spiCommand) {
case 0x03: // RD case 0x03: // RD
@ -250,6 +253,13 @@ static uint8_t _slot1SPIEEPROM(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->isHomebrew) {
if (!_slot1GuaranteeSize(&dscore->p->memory.slot1)) {
return 0xFF;
}
}
if (!dscore->p->memory.slot1.spiData) {
return 0xFF;
} }
switch (dscore->p->memory.slot1.spiCommand) { switch (dscore->p->memory.slot1.spiCommand) {
@ -278,6 +288,9 @@ static uint8_t _slot1SPIFlash(struct DSCommon* dscore, uint8_t datum) {
return 0xFF; return 0xFF;
} }
} }
if (!dscore->p->memory.slot1.spiData) {
return 0xFF;
}
uint8_t oldValue; uint8_t oldValue;
switch (dscore->p->memory.slot1.spiCommand) { switch (dscore->p->memory.slot1.spiCommand) {
@ -410,7 +423,7 @@ void DSSlot1ConfigureSPI(struct DS* ds, uint32_t paramPtr) {
} else { } else {
ds->memory.slot1.spiAddressingBits = 16; ds->memory.slot1.spiAddressingBits = 16;
} }
ds->memory.slot1.spiAddress = size; ds->memory.slot1.spiAddress = size - 1;
_slot1GuaranteeSize(&ds->memory.slot1); _slot1GuaranteeSize(&ds->memory.slot1);
} }