Mirrors/cartreader
2
0
Fork 0
mirror of https://github.com/sanni/cartreader.git synced 2024-11-14 08:55:06 +01:00
Code Issues Projects Releases Wiki Activity

NES.ino: Convert nointro-disabled global variables into locals

Browse Source 
Also, remove dead error handling code: sd.exists internally opens the file
and returns the produced status, so myFile.open return value should be the
same.
This commit is contained in:
Vincent Pelletier 2022-10-29 00:38:06 +00:00
parent 264bfd5ce5
commit 64db4ded54
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Cart_Reader/NES.ino
View File

@ -195,16 +195,6 @@ boolean flashfound = false; // NESmaker 39SF040 Flash Cart
// Files // Files
char fileCount[3]; char fileCount[3];
#ifndef nointro
FsFile nesFile;
uint32_t prg_crc32;
uint32_t chr_crc32;
char filePRG[] = "PRG.bin";
char fileCHR[] = "CHR.bin";
char fileNES[] = "CART.nes";
char fileBIN[] = "CART.bin";
#endif
// Cartridge Config // Cartridge Config
byte mapper; byte mapper;
byte prgsize; byte prgsize;
@ -1226,13 +1216,17 @@ uint32_t atoi32_unsigned(const char* input_string) {
} }
void outputNES() { void outputNES() {
display_Clear(); FsFile nesFile;
const char fileNES[] = "CART.nes";
const char fileBIN[] = "CART.bin";
char* outputFile; char* outputFile;
unsigned long crcOffset = 0; unsigned long crcOffset = 0;
uint32_t prg_size_bytes = 1024 * (uint32_t)prg; uint32_t prg_size_bytes = 1024 * (uint32_t)prg;
uint32_t chr_size_bytes = 1024 * (uint32_t)chr; uint32_t chr_size_bytes = 1024 * (uint32_t)chr;
int has_header = 0; int has_header = 0;
display_Clear();
unsigned char* nes_header_bytes = getNESHeaderForFileInfo(prg_size_bytes, chr_size_bytes, prg_crc32, chr_crc32); unsigned char* nes_header_bytes = getNESHeaderForFileInfo(prg_size_bytes, chr_size_bytes, prg_crc32, chr_crc32);
if (nes_header_bytes != NULL) { if (nes_header_bytes != NULL) {
@ -1242,7 +1236,7 @@ void outputNES() {
LED_RED_ON; LED_RED_ON;
LED_GREEN_ON; LED_GREEN_ON;
LED_BLUE_ON; LED_BLUE_ON;
if (!myFile.open(filePRG, FILE_READ)) { if (!myFile.open("PRG.bin", FILE_READ)) {
LED_GREEN_OFF; LED_GREEN_OFF;
LED_BLUE_OFF; LED_BLUE_OFF;
@ -1285,16 +1279,7 @@ void outputNES() {
nesFile.write(sdBuffer, n); nesFile.write(sdBuffer, n);
} }
myFile.close(); myFile.close();
if (sd.exists(fileCHR)) { if (myFile.open("CHR.bin", FILE_READ)) {
if (!myFile.open(fileCHR, FILE_READ)) {
LED_GREEN_OFF;
LED_BLUE_OFF;
display_Clear();
println_Msg(F("CHR FILE FAILED!"));
display_Update();
print_Error(sd_error_STR, true);
}
while ((n = myFile.read(sdBuffer, sizeof(sdBuffer))) > 0) { while ((n = myFile.read(sdBuffer, sizeof(sdBuffer))) > 0) {
nesFile.write(sdBuffer, n); nesFile.write(sdBuffer, n);
} }