aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRichard Weick <[email protected]>2023-09-12 19:34:43 -0500
committerGitHub <[email protected]>2023-09-12 19:34:43 -0500
commitfafd9caf7f3876f4c0669967d78f734f5492c321 (patch)
tree419a3b61000ca13c8be0b64c7315ca4bbfd00994
parent3a30c0f5eda663dc706c1ca934b2fb477c1ced65 (diff)
parente92e42c5816f90e459eaea6329a729fb499bb222 (diff)
downloadcartreader-fafd9caf7f3876f4c0669967d78f734f5492c321.tar.gz
cartreader-fafd9caf7f3876f4c0669967d78f734f5492c321.zip
Merge pull request #849 from RWeick/master
Update Xplorer64 functions in N64.ino to fix a potential issue for compilation.
-rw-r--r--Cart_Reader/N64.ino9
1 files changed, 3 insertions, 6 deletions
diff --git a/Cart_Reader/N64.ino b/Cart_Reader/N64.ino
index 8627793..8124d2b 100644
--- a/Cart_Reader/N64.ino
+++ b/Cart_Reader/N64.ino
@@ -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();
@@ -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);
@@ -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);