Fixed emunand detection on n3ds

roxas75 · Aug 10, 2015 · 3b92f31 · 3b92f31 · AlbertoSONIC · Aug 10, 2015
1 parent bc08b47
commit 3b92f31
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/rxtools/source/features/cfw.c b/rxtools/source/features/cfw.c
@@ -47,7 +47,7 @@ _Noreturn void (* const _softreset)() = (void *)0x080F0000;
 // @breif  Determine platform of the console.
 // @retval PLATFORM_N3DS for New3DS, and PLATFORM_3DS for Old3DS.
 // @note   Maybe modified to support more platforms
-static Platform_UnitType Platform_CheckUnit(void) {
+Platform_UnitType Platform_CheckUnit(void) {
 	return *(u32 *)PLATFORM_REG_ADDR;
 }
 

diff --git a/rxtools/source/features/cfw.h b/rxtools/source/features/cfw.h
@@ -36,6 +36,7 @@ typedef enum {
 	PLATFORM_N3DS=7,
 } Platform_UnitType;
 
+Platform_UnitType Platform_CheckUnit(void);
 int DevMode();
 void FirmLoader();
 void rxModeWithSplash(int emu);

diff --git a/rxtools/source/lib/nand.c b/rxtools/source/lib/nand.c
@@ -20,6 +20,7 @@
 #include "crypto.h"
 #include "fatfs/sdmmc.h"
 #include "nand.h"
+#include "cfw.h"
 
 u8 NANDCTR[16];
 int sysversion = 0;
@@ -64,13 +65,16 @@ void FSNandInitCrypto(void) {
 
 unsigned int checkEmuNAND() {
 	u8 *check = (u8 *)0x26000000;
-	sdmmc_sdcard_readsectors(0x3AF00000 / 0x200, 1, check);
+	int isn3ds = 0;
+	if (Platform_CheckUnit() == PLATFORM_N3DS)isn3ds = 1;
+
+	sdmmc_sdcard_readsectors(isn3ds ? 0x4D800000 /0x200 : 0x3AF00000 / 0x200, 1, check);
 	if (*((char *)check + 0x100) == 'N' && *((char *)check + 0x101) == 'C' && *((char *)check + 0x102) == 'S' && *((char *)check + 0x103) == 'D') {
-		return 0x3AF00000;
+		return isn3ds ? 0x4D800000 : 0x3AF00000;
 	} else {
-		sdmmc_sdcard_readsectors(0x3BA00000 / 0x200, 1, check);
+		sdmmc_sdcard_readsectors(isn3ds ? 0x76000000 /0x200 : 0x3BA00000 / 0x200, 1, check);
 		if (*((char *)check + 0x100) == 'N' && *((char *)check + 0x101) == 'C' && *((char *)check + 0x102) == 'S' && *((char *)check + 0x103) == 'D') {
-			return 0x3BA00000;
+			return isn3ds ? 0x76000000 : 0x3BA00000;
 		} else {
 			return 0;
 		}