Skip to content

Commit

Permalink
Merge pull request #849 from RWeick/master
Browse files Browse the repository at this point in the history
Update Xplorer64 functions in N64.ino to fix a potential issue for compilation.
  • Loading branch information
RWeick authored Sep 13, 2023
2 parents 3a30c0f + e92e42c commit fafd9ca
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions Cart_Reader/N64.ino
Original file line number Diff line number Diff line change
Expand Up @@ -4542,8 +4542,7 @@ void flashXplorer_N64() {
println_Msg(F(""));
println_Msg(F("Turn Cart Reader off now"));
display_Update();
while (1)
;
while (1);
} else {
display_Clear();
display_Update();
Expand Down Expand Up @@ -4580,9 +4579,7 @@ void idXplorer_N64() {
setAddress_N64(0x10740000);
readWord_N64();

if (flashid == 0x0808) {
flashSize = 262144;
} else {
if (flashid != 0x0808) {
println_Msg(F("Check cart connection"));
println_Msg(F("Unknown Flash ID"));
sprintf(flashid_str, "%04X", flashid);
Expand Down Expand Up @@ -4708,7 +4705,7 @@ void eraseXplorer_N64() {
println_Msg(F("Erasing..."));
display_Update();

// Send chip erase to SST 29LE010 / AMTEL AT29LV010A / SST 29EE010
// Send chip erase to SST 29LE010
oddXPaddrWrite(0x1040AAAA, 0xAAAA);
evenXPaddrWrite(0x10405555, 0x5555);
oddXPaddrWrite(0x1040AAAA, 0x8080);
Expand Down

0 comments on commit fafd9ca

Please sign in to comment.