From 998be2cb361aaaa8364bdc698a4b0f3b102bab72 Mon Sep 17 00:00:00 2001
From: Bernardo Giordano <bernardogiordano369@gmail.com>
Date: Wed, 8 Aug 2018 22:51:33 +0200
Subject: [PATCH] Fix #85 : Add support to undocumented DS cartridges (#134)

* debug

* some more logging (#133)

* force type to be 6

* fix compiling error

* add undocumented jedec value
---
 3ds/include/spi.hpp |  1 +
 3ds/source/spi.cpp  | 41 ++++++++++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/3ds/include/spi.hpp b/3ds/include/spi.hpp
index 79b9f95..a500b84 100644
--- a/3ds/include/spi.hpp
+++ b/3ds/include/spi.hpp
@@ -46,6 +46,7 @@
 #define SPI_HPP
 
 #include <3ds.h>
+#include <cstdio>
 #include <cstring>
 
 extern "C" {
diff --git a/3ds/source/spi.cpp b/3ds/source/spi.cpp
index 24119d2..8f3e16a 100644
--- a/3ds/source/spi.cpp
+++ b/3ds/source/spi.cpp
@@ -378,8 +378,11 @@ Result SPIGetCardType(CardType* type, int infrared)
     
     u32 maxTries = (infrared == -1) ? 2 : 1; // note: infrared = -1 fails 1/3 of the time
     while (tries < maxTries)
-    { 
+    {
         res = SPIReadJEDECIDAndStatusReg(t, &jedec, &sr); // dummy
+        //fprintf(stderr, "JEDEC: 0x%016lX\n", jedec);
+        //fprintf(stderr, "SPIReadJEDECIDAndStatusReg: %016lX\n", res);
+        //fprintf(stderr, "CardType (While inside maxTries loop): %016lX\n", t);
         if (res) return res;
         
         if ((sr & 0xfd) == 0x00 && (jedec != 0x00ffffff)) { break; }		
@@ -388,44 +391,60 @@ Result SPIGetCardType(CardType* type, int infrared)
         
         ++tries;
         t = FLASH_INFRARED_DUMMY;
-    } 
+    }
+
+    //fprintf(stderr, "CardType (after the maxTries loop): %016lX\n", t);
     
-    if (t == EEPROM_512B) { *type = t; return 0; }
+    if (t == EEPROM_512B)
+    {
+        //fprintf(stderr, "Type is EEPROM_512B: %d\n", t); 
+        *type = t;
+        return 0;
+    }
     else if (t == EEPROM_STD_DUMMY)
     {
         bool mirrored = false;
-        
-        if ( (res = _SPIIsDataMirrored(t, 8192, &mirrored)) ) return res;
+        if ((res = _SPIIsDataMirrored(t, 8192, &mirrored))) { return res; }
         if (mirrored) t = EEPROM_8KB;
         else
         {
-            if ( (res = _SPIIsDataMirrored(t, 65536, &mirrored)) ) return res;
+            if ((res = _SPIIsDataMirrored(t, 65536, &mirrored))) { return res; }
             if (mirrored) t = EEPROM_64KB;
             else t = EEPROM_128KB;
         }
         
         *type = t;
+        //fprintf(stderr, "Type: %d\n", t);
         return 0;
     }
     else if (t == FLASH_INFRARED_DUMMY)
     {
         if (infrared == 0) *type = NO_CHIP; // did anything go wrong?
-        
         if (jedec == jedecOrderedList[0] || jedec == jedecOrderedList[1]) *type = FLASH_256KB_INFRARED;
         else *type = FLASH_512KB_INFRARED;
-        
         return 0;
     }
     else
     {
-        if (infrared == 1) *type = NO_CHIP; // did anything go wrong?
+        if (infrared == 1)
+        {
+            *type = NO_CHIP; // did anything go wrong?
+            //fprintf(stderr, "infrared is 1, *type = NO_CHIP\n");
+        }
         if (jedec == 0x204017) { *type = FLASH_8MB; return 0; } // 8MB. savegame-manager: which one? (more work is required to unlock this save chip!)
+        if (jedec == 0x208013) { *type = FLASH_512KB_1; return 0; }
 
         for (int i = 0; i < 6; ++i)
         {
-            if(jedec == jedecOrderedList[i]) { *type = (CardType)((int) FLASH_256KB_1 + i); return 0; }  
+            if(jedec == jedecOrderedList[i])
+            {
+                *type = (CardType)((int) FLASH_256KB_1 + i);
+                //fprintf(stderr, "Found a jedec equal to one in the ordered list. Type: %016lX", *type);
+                return 0;
+            }  
         }
-        
+
+        //fprintf(stderr, "*type = NO_CHIP\n");
         *type = NO_CHIP;
         return 0;
     }