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

Merge pull request #605 from vpelletier/re_fix_compiler_warnings

Browse Source 
Re-fix compiler warnings
This commit is contained in:
sanni 2022-11-01 12:02:09 +01:00 committed by GitHub
commit a8a78347a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cart_Reader/SFM.ino
View File

@ -912,7 +912,7 @@ void readROM_SFM() {
display_Update(); display_Update();
// Read up to 96 banks starting at bank 0×00. // Read up to 96 banks starting at bank 0×00.
for (byte currBank = 0; currBank < numBanks; currBank++) { for (word currBank = 0; currBank < numBanks; currBank++) {
// Dump the bytes to SD 512B at a time // Dump the bytes to SD 512B at a time
for (long currByte = 32768; currByte < 65536; currByte += 512) { for (long currByte = 32768; currByte < 65536; currByte += 512) {
for (int c = 0; c < 512; c++) { for (int c = 0; c < 512; c++) {
@ -1064,7 +1064,7 @@ void writeFlash_SFM(int startBank, uint32_t pos) {
draw_progressbar(0, totalProgressBar); draw_progressbar(0, totalProgressBar);
// Write lorom // Write lorom
for (byte currBank = 0; currBank < numBanks; currBank++) { for (word currBank = 0; currBank < numBanks; currBank++) {
for (unsigned long currByte = 0x8000; currByte < 0x10000; currByte += 128) { for (unsigned long currByte = 0x8000; currByte < 0x10000; currByte += 128) {
myFile.read(sdBuffer, 128); myFile.read(sdBuffer, 128);
// Write command sequence // Write command sequence
@ -1179,7 +1179,7 @@ byte blankcheck_SFM(int startBank) {
} }
} }
} else { } else {
for (byte currBank = 0; currBank < numBanks; currBank++) { for (word currBank = 0; currBank < numBanks; currBank++) {
for (unsigned long currByte = 0x8000; currByte < 0x10000; currByte++) { for (unsigned long currByte = 0x8000; currByte < 0x10000; currByte++) {
if (readBank_SFM(currBank, currByte) != 0xFF) { if (readBank_SFM(currBank, currByte) != 0xFF) {
currBank = numBanks; currBank = numBanks;
@ -1219,7 +1219,7 @@ unsigned long verifyFlash_SFM(int startBank, uint32_t pos) {
} }
} }
} else { } else {
for (byte currBank = 0; currBank < numBanks; currBank++) { for (word currBank = 0; currBank < numBanks; currBank++) {
for (unsigned long currByte = 0x8000; currByte < 0x10000; currByte += 512) { for (unsigned long currByte = 0x8000; currByte < 0x10000; currByte += 512) {
// Fill SDBuffer // Fill SDBuffer
myFile.read(sdBuffer, 512); myFile.read(sdBuffer, 512);
@ -1268,7 +1268,7 @@ void readFlash_SFM() {
} }
} }
} else { } else {
for (byte currBank = 0; currBank < numBanks; currBank++) { for (word currBank = 0; currBank < numBanks; currBank++) {
for (unsigned long currByte = 0x8000; currByte < 0x10000; currByte += 512) { for (unsigned long currByte = 0x8000; currByte < 0x10000; currByte += 512) {
for (int c = 0; c < 512; c++) { for (int c = 0; c < 512; c++) {
sdBuffer[c] = readBank_SFM(currBank, currByte + c); sdBuffer[c] = readBank_SFM(currBank, currByte + c);

20
Cart_Reader/SNES.ino
View File

@ -699,6 +699,24 @@ void readHiRomBanks(unsigned int start, unsigned int total, FsFile* file) {
void getCartInfo_SNES() { void getCartInfo_SNES() {
boolean manualConfig = 0; boolean manualConfig = 0;
//Prime SA1 cartridge
PORTL = 192;
for (uint16_t currByte = 0; currByte < 1024; currByte++) {
PORTF = currByte & 0xFF;
PORTK = currByte >> 8;
// Wait for the Byte to appear on the data bus
// Arduino running at 16Mhz -> one nop = 62.5ns
// slowRom is good for 200ns, fastRom is <= 120ns; S-CPU best case read speed: 3.57MHz / 280ns
// let's be conservative and use 6 x 62.5 = 375ns
NOP;
NOP;
NOP;
NOP;
NOP;
NOP;
}
// Print start page // Print start page
if (checkcart_SNES() == 0) { if (checkcart_SNES() == 0) {
// Checksum either corrupt or 0000 // Checksum either corrupt or 0000
@ -1344,7 +1362,7 @@ void readROM_SNES() {
controlIn_SNES(); controlIn_SNES();
byte initialSOMap = readBank_SNES(0, 18439); byte initialSOMap = readBank_SNES(0, 18439);
for (byte currMemmap = 0; currMemmap < (numBanks / 16); currMemmap++) { for (word currMemmap = 0; currMemmap < (numBanks / 16); currMemmap++) {
dataOut(); dataOut();
controlOut_SNES(); controlOut_SNES();