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

GBA Savedata: Update and fix Sharkport importing (fixes #658)

This commit is contained in:
Vicki Pfau 2017-06-13 22:01:36 -07:00
parent ae38726284
commit caa1d45793
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gba/sharkport.c
View File

@ -115,24 +115,14 @@ bool GBASavedataImportSharkPort(struct GBA* gba, struct VFile* vf, bool testChec
uint32_t copySize = size - 0x1C; uint32_t copySize = size - 0x1C;
switch (gba->memory.savedata.type) { switch (gba->memory.savedata.type) {
case SAVEDATA_SRAM:
if (copySize > SIZE_CART_SRAM) {
copySize = SIZE_CART_SRAM;
}
break;
case SAVEDATA_FLASH512: case SAVEDATA_FLASH512:
if (copySize > SIZE_CART_FLASH512) { if (copySize > SIZE_CART_FLASH512) {
GBASavedataForceType(&gba->memory.savedata, SAVEDATA_FLASH1M, gba->memory.savedata.realisticTiming); GBASavedataForceType(&gba->memory.savedata, SAVEDATA_FLASH1M, gba->memory.savedata.realisticTiming);
} }
// Fall through // Fall through
case SAVEDATA_FLASH1M: default:
if (copySize > SIZE_CART_FLASH1M) { if (copySize > GBASavedataSize(&gba->memory.savedata)) {
copySize = SIZE_CART_FLASH1M; copySize = GBASavedataSize(&gba->memory.savedata);
}
break;
case SAVEDATA_EEPROM:
if (copySize > SIZE_CART_EEPROM) {
copySize = SAVEDATA_EEPROM;
} }
break; break;
case SAVEDATA_FORCE_NONE: case SAVEDATA_FORCE_NONE:
@ -141,6 +131,7 @@ bool GBASavedataImportSharkPort(struct GBA* gba, struct VFile* vf, bool testChec
} }
memcpy(gba->memory.savedata.data, &payload[0x1C], copySize); memcpy(gba->memory.savedata.data, &payload[0x1C], copySize);
gba->memory.savedata.vf && gba->memory.savedata.vf->sync(gba->memory.savedata.vf, gba->memory.savedata.data, size);
free(payload); free(payload);
return true; return true;