separate nand and sd init

Author: WinterMute

include/nds/arm7/sdmmc.h

@@ -125,7 +125,7 @@ enum {
     MMC_DEVICE_NAND,
 };
 
-void sdmmc_controller_init();
+void sdmmc_controller_init(bool force_init);
 void sdmmc_initirq();
 int sdmmc_cardinserted();
 

source/arm7/sdmmc.twl.c

@@ -177,9 +177,15 @@ int sdmmc_cardinserted() {
 	return 1; //sdmmc_cardready;
 }
 
+
+static bool sdmmc_controller_initialised = false;
+
 //---------------------------------------------------------------------------------
-void sdmmc_controller_init() {
+void sdmmc_controller_init( bool force_init ) {
 //---------------------------------------------------------------------------------
+
+    if (!force_init && sdmmc_controller_initialised) return;
+
     deviceSD.isSDHC = 0;
     deviceSD.SDOPT = 0;
     deviceSD.res = 0;
@@ -230,6 +236,8 @@ void sdmmc_controller_init() {
     *(vu16*)(SDMMC_BASE + REG_SDBLKLEN) = 512;
     *(vu16*)(SDMMC_BASE + REG_SDSTOP) = 0;
 
+    sdmmc_controller_initialised = true;
+
     setTarget(&deviceSD);
 }
 
@@ -486,11 +494,25 @@ void sdmmcMsgHandler(int bytes, void *user_data) {
     fifoSendValue32(FIFO_SDMMC, retval);
 }
 
+//---------------------------------------------------------------------------------
+int sdmmc_nand_startup() {
+//---------------------------------------------------------------------------------
+    sdmmc_controller_init(false);
+    return sdmmc_nand_init();
+}
+
+//---------------------------------------------------------------------------------
+int sdmmc_sd_startup() {
+//---------------------------------------------------------------------------------
+    sdmmc_controller_init(false);
+    return sdmmc_sdcard_init();
+}
+
 //---------------------------------------------------------------------------------
 void sdmmcValueHandler(u32 value, void* user_data) {
 //---------------------------------------------------------------------------------
     int result = 0;
-
+    int sdflag = 0;
     int oldIME = enterCriticalSection();
 
     switch(value) {
@@ -500,12 +522,13 @@ void sdmmcValueHandler(u32 value, void* user_data) {
         break;
 
     case SDMMC_SD_START:
+        sdflag = 1;
+        /* Falls through. */
+    case SDMMC_NAND_START:
         if (sdmmc_read16(REG_SDSTATUS0) == 0) {
             result = 1;
         } else {
-            sdmmc_controller_init();
-            sdmmc_nand_init();
-            result = sdmmc_sdcard_init();
+            result = (sdflag == 1 ) ? sdmmc_sd_startup() : sdmmc_nand_startup();
         }
         break;
 

source/arm9/dldi/nand.twl.c

@@ -9,7 +9,19 @@
 //---------------------------------------------------------------------------------
 bool nand_Startup() {
 //---------------------------------------------------------------------------------
-	return true;
+	fifoSendValue32(FIFO_SDMMC,SDMMC_HAVE_SD);
+	while(!fifoCheckValue32(FIFO_SDMMC));
+	int result = fifoGetValue32(FIFO_SDMMC);
+
+	if(result==0) return false;
+
+	fifoSendValue32(FIFO_SDMMC,SDMMC_NAND_START);
+
+	fifoWaitValue32(FIFO_SDMMC);
+
+	result = fifoGetValue32(FIFO_SDMMC);
+
+	return result == 0;
 }
 
 //---------------------------------------------------------------------------------

source/arm9/dldi/sd.twl.c

@@ -18,7 +18,7 @@ bool sdio_Startup() {
 	fifoWaitValue32(FIFO_SDMMC);
 
 	result = fifoGetValue32(FIFO_SDMMC);
-	
+
 	return result == 0;
 }