Device: Writing issue NAND-X/JR-P, fixes #29

Author: Octal450

J-Runner/Classes/Nand-X.cs

@@ -534,7 +534,7 @@ private Errors write_v2(string filename, Nandsize nsize, bool print = true, int
                     string flashconfig = BitConverter.ToString(readBuffer, 0, 0x4).Replace("-", "");
 
                     int layout = 1;
-                    if (flashconfig == "00AA3020" || flashconfig == "008A3020") layout = 2;
+                    if (flashconfig == "00AA3020" || flashconfig == "008A3020" || flashconfig == "00AC3020" || flashconfig == "008C3020") layout = 2;
                     else if (flashconfig == "01198010") layout = 0;
                     else layout = 1;
 
@@ -600,7 +600,7 @@ private Errors write_v2(string filename, Nandsize nsize, bool print = true, int
 
                             if (fixecc) writeBuffer = Nand.Nand.addecc_v2(writeBuffer, false, i * 0x4200, layout);
 
-                            if (flashconfig == "00AA3020" || flashconfig == "008A3020")
+                            if (flashconfig == "00AA3020" || flashconfig == "008A3020" || flashconfig == "00AC3020" || flashconfig == "008C3020")
                             {
                                 reserveblockpos = 0x1FF;
                             }

J-Runner/MainForm.cs

@@ -1399,31 +1399,11 @@ void writenand(bool ecc, int writelength = 0)
             {
                 double len = new FileInfo(variables.filename1).Length;
                 if (variables.debugMode) Console.WriteLine("File Length: {0}", len);
-                
-                string flashconf = variables.flashconfig; // Set by flash config check
-                if (flashconf == "008A3020" || flashconf == "008C3020")
-                {
-                    if (len == 553648128) variables.nandsizex = Nandsize.S512; // Just in case, but this might be bad
-                    else if (len == 276824064) variables.nandsizex = Nandsize.S256;
-                    else if (len == 69206016) variables.nandsizex = Nandsize.S64;
-                    else variables.nandsizex = Nandsize.S16;
-                }
-                else if (flashconf == "00AA3020" || flashconf == "00AC3020")
-                {
-                    if (len == 553648128) variables.nandsizex = Nandsize.S512;
-                    else if (len == 276824064) variables.nandsizex = Nandsize.S256; // Just in case, but this might be bad
-                    else if (len == 69206016) variables.nandsizex = Nandsize.S64;
-                    else variables.nandsizex = Nandsize.S16;
-                }
-                else if (flashconf == "01198030")
-                {
-                    if (len == 69206016) variables.nandsizex = Nandsize.S64;
-                    else variables.nandsizex = Nandsize.S16;
-                }
-                else
-                {
-                    variables.nandsizex = Nandsize.S16;
-                }
+
+                if (len == 553648128) variables.nandsizex = Nandsize.S512;
+                else if (len == 276824064) variables.nandsizex = Nandsize.S256;
+                else if (len == 69206016) variables.nandsizex = Nandsize.S64;
+                else variables.nandsizex = Nandsize.S16;
 
                 if (Path.GetExtension(variables.filename1) == ".ecc")
                 {

J-Runner/Resources/Build.txt

@@ -1 +1 @@
-11-22-2022 22:59:59
+11-22-2022 23:19:13