Move some define in sam3x sd implementaion. Define sd speeds macro to clarify the...

[bertos.git] / bertos / cpu / cortex-m3 / drv / sd_sam3.c

diff --git a/bertos/cpu/cortex-m3/drv/sd_sam3.c b/bertos/cpu/cortex-m3/drv/sd_sam3.c
index aa53ecc05de1537e2eb7bf648e97c6a0308c44c1..de5a9821a6bc64cc0920ab3d0dc868633e09f60e 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/sd_sam3.c
+++ b/bertos/cpu/cortex-m3/drv/sd_sam3.c
@@ -55,20 +55,40 @@
 #include <string.h> /* memset */
 
 
+#define SD_SEND_ALL_CID        BV(0)
 #define SD_STATUS_APP_CMD      BV(5)
 #define SD_STATUS_READY        BV(8)
-#define SD_STATUS_CURR_MASK    0x1E00
-#define SD_STATUS_CURR_SHIFT   9
+#define SD_CARD_IS_LOCKED      BV(25)
 
-#define SD_READY_FOR_DATA         BV(8)
-#define SD_CARD_IS_LOCKED         BV(25)
+#define SD_OCR_CCS              BV(30)     /**< SD Card Capacity Status (CCS) */
+#define SD_OCR_BUSY             BV(31)     /**< SD/MMC Card power up status bit (busy) */
 
-#define SD_SEND_CID_RCA     0
-#define SD_SEND_ALL_CID   BV(0)
+#define SD_OCR_VDD_27_28        BV(15)
+#define SD_OCR_VDD_28_29        BV(16)
+#define SD_OCR_VDD_29_30        BV(17)
+#define SD_OCR_VDD_30_31        BV(18)
+#define SD_OCR_VDD_31_32        BV(19)
+#define SD_OCR_VDD_32_33        BV(20)
 
 
+#define SD_HOST_VOLTAGE_RANGE     (SD_OCR_VDD_27_28 | \
+                                   SD_OCR_VDD_28_29 | \
+                                   SD_OCR_VDD_29_30 | \
+                                   SD_OCR_VDD_30_31 | \
+                                   SD_OCR_VDD_31_32 | \
+                                   SD_OCR_VDD_32_33)
+
+
+#define CMD8_V_RANGE_CHECK_PAT    0xAA
+#define CMD8_V_RANGE_27V_36V      (0x100 | CMD8_V_RANGE_CHECK_PAT)
+#define CMD8_V_RANGE_LOW          (0x1000 | CMD8_V_RANGE_CHECK_PAT)
+#define CMD8_V_ECHO_REPLY         0xFF
+#define CMD8_SUPP_V_RANGE_REPLY   0xFF00
+
+
+#define SD_GET_ERRORS(status)   ((status) & 0xFFF80000)
 #define SD_ADDR_TO_RCA(addr)    (uint32_t)(((addr) << 16) & 0xFFFF0000)
-#define SD_GET_STATE(status)    (uint8_t)(((status) & SD_STATUS_CURR_MASK) >> SD_STATUS_CURR_SHIFT)
+#define SD_GET_STATE(status)    (uint8_t)(((status) & 0x1E00) >> 9)
 
 static const uint32_t tran_exp[] =
 {
@@ -318,11 +338,8 @@ int sd_sendAppOpCond(Sd *sd)
                                LOG_INFO("SD power up! Hight Capability [%d]\n", (bool)((sd->status) & SD_OCR_CCS));
                                return 0;
                        }
-
-                       LOG_ERR("sd not ready.\n");
                }
        }
-
        return -1;
 }
 
@@ -604,7 +621,7 @@ int sd_getStatus(Sd *sd, SdSSR *ssr, uint32_t *buf, size_t words)
 void sd_setHightSpeed(Sd *sd)
 {
        (void)sd;
-       hsmci_setSpeed(2100000, true);
+       hsmci_setSpeed(HSMCI_HIGH_SPEED, HSMCI_HS_MODE);
 }
 
 
@@ -683,7 +700,7 @@ static size_t sd_SdWriteDirect(KBlock *b, block_idx_t idx, const void *buf, size
 static int sd_SdError(KBlock *b)
 {
        Sd *sd = SD_CAST(b);
-       return 0;//sd->status;
+       return SD_GET_ERRORS(sd->status);
 }
 
 static void sd_SdClearerr(KBlock *b)
@@ -694,6 +711,7 @@ static void sd_SdClearerr(KBlock *b)
 
 static bool sd_blockInit(Sd *sd, KFile *ch)
 {
+       (void)ch;
        ASSERT(sd);
        memset(sd, 0, sizeof(*sd));
        DB(sd->b.priv.type = KBT_SD);
@@ -759,7 +777,7 @@ static bool sd_blockInit(Sd *sd, KFile *ch)
                        return false;
                }
 
-               if (sd->status & SD_READY_FOR_DATA)
+               if (sd->status & SD_STATUS_READY)
                {
                        sd_selectCard(sd);
                        sd_set_BlockLen(sd, SD_DEFAULT_BLOCKLEN);
@@ -774,7 +792,7 @@ static bool sd_blockInit(Sd *sd, KFile *ch)
                        return true;
                }
        }
-
+       LOG_ERR("SD not ready.\n");
        return false;
 }