Mirrors/Checkpoint
2
0
Fork 0
mirror of https://github.com/BernardoGiordano/Checkpoint synced 2024-11-14 21:57:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix #85 : Add support to undocumented DS cartridges (#134)

Browse source 
* debug

* some more logging (#133)

* force type to be 6

* fix compiling error

* add undocumented jedec value
This commit is contained in:
Bernardo Giordano 2018-08-08 22:51:33 +02:00 committed by GitHub
parent 2df56e0159
commit 998be2cb36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
3ds/include/spi.hpp
View file

@ -46,6 +46,7 @@
#define SPI_HPP
#include <3ds.h>
#include <cstdio>
#include <cstring>
extern "C" {

41
3ds/source/spi.cpp
View file

@ -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;
}