Mirrors/cartreader
2
0
Fork 0
mirror of https://github.com/sanni/cartreader.git synced 2024-11-26 22:44:15 +01:00
Code Issues Projects Releases Wiki Activity

N64.ino: Handle reused global from FLASH.ino

Browse Source
This commit is contained in:
Ancyker 2023-09-14 12:00:58 -04:00
parent 4f8ef61355
commit 74fba5e29d
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Cart_Reader/N64.ino
View File

@ -44,6 +44,10 @@ String CRC1 = "";
String CRC2 = ""; String CRC2 = "";
#endif #endif
#if !defined(enable_FLASH)
unsigned long flashSize;
#endif
static const char N64_EEP_FILENAME_FMT[] PROGMEM = "%s.eep"; static const char N64_EEP_FILENAME_FMT[] PROGMEM = "%s.eep";
static const char N64_SAVE_DIRNAME_FMT[] PROGMEM = "N64/SAVE/%s/%d"; static const char N64_SAVE_DIRNAME_FMT[] PROGMEM = "N64/SAVE/%s/%d";
@ -4181,15 +4185,15 @@ void idGameshark_N64() {
} else if (flashid == 0x0404) { } else if (flashid == 0x0404) {
//Set SST 28LF040 flashrom size //Set SST 28LF040 flashrom size
flashSize = 1048574; flashSize = 1048574;
} else { } else {
println_Msg(F("Check cart connection")); println_Msg(F("Check cart connection"));
println_Msg(F("Unknown Flash ID")); println_Msg(F("Unknown Flash ID"));
sprintf(flashid_str, "%04X", flashid); sprintf(flashid_str, "%04X", flashid);
print_STR(press_button_STR, 1); print_STR(press_button_STR, 1);
display_Update(); display_Update();
wait(); wait();
mainMenu(); mainMenu();
} }
sprintf(flashid_str, "%04X", flashid); sprintf(flashid_str, "%04X", flashid);
// Reset flashrom // Reset flashrom
resetGameshark_N64(); resetGameshark_N64();