1 files changed, 21 insertions, 11 deletions
diff --git a/fw/fe310/eos/dev/sdcard.c b/fw/fe310/eos/dev/sdcard.c
index 1edad96..ebdc883 100644
--- a/fw/fe310/eos/dev/sdcard.c
+++ b/fw/fe310/eos/dev/sdcard.c
@@ -1,38 +1,48 @@
 #include <stdlib.h>
 #include <stdint.h>
 
+#include "encoding.h"
+#include "platform.h"
+#include "board.h"
+
 #include "eos.h"
 
-#include "board.h"
 #include "spi.h"
 
 #include "drv/sdcard.h"
 #include "sdcard.h"
 
-#ifdef EOS_DEBUG
-#include <stdio.h>
-#endif
+#define SDC_DETECT_TIMEOUT      1000
 
-void eos_sdc_insert(int sdc_det) {
-    int rv;
+int eos_sdc_init(void) {
+    clear_csr(mstatus, MSTATUS_MIE);
+    GPIO_REG(GPIO_OUTPUT_VAL)   |= (1 << SPI_CSPIN_SDC);
+    set_csr(mstatus, MSTATUS_MIE);
+    GPIO_REG(GPIO_OUTPUT_EN)    |= (1 << SPI_CSPIN_SDC);
 
-    rv = EOS_OK;
+    return EOS_OK;
+}
+
+int eos_sdc_insert(int sdc_det, uint32_t timeout) {
+    if (timeout == 0) timeout = SDC_DETECT_TIMEOUT;
     if (sdc_det) {
+        int rv;
+
         eos_spi_set_div(EOS_SPI_DEV_SDC, 1024);     // 100 - 400 kHz
 
         rv = eos_spi_select(EOS_SPI_DEV_SDC);
         if (rv) goto sdc_insert_fin;
 
-        rv = sdc_init(1000);
+        rv = sdc_init(timeout);
+        if (rv) rv = EOS_ERR_NOTFOUND;
         eos_spi_deselect();
 
 sdc_insert_fin:
         eos_spi_set_div(EOS_SPI_DEV_SDC, SPI_DIV_SDC);
+        if (rv) return rv;
     } else {
         sdc_clear();
     }
 
-#ifdef EOS_DEBUG
-    if (rv) printf("SDC INSERT ERR:%d\n", rv);
-#endif
+    return EOS_OK;
 }