X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fcortex-m3%2Fdrv%2Fsd_sam3.c;h=75817e02b92436e8d7b31c71fa26ee87c67e167f;hb=485f68165577f92d04057771bd11e969be9a2c7c;hp=aa53ecc05de1537e2eb7bf648e97c6a0308c44c1;hpb=1185bd2bb58da6239fc031b8e6034992d6fc3cc0;p=bertos.git diff --git a/bertos/cpu/cortex-m3/drv/sd_sam3.c b/bertos/cpu/cortex-m3/drv/sd_sam3.c index aa53ecc0..75817e02 100644 --- a/bertos/cpu/cortex-m3/drv/sd_sam3.c +++ b/bertos/cpu/cortex-m3/drv/sd_sam3.c @@ -26,12 +26,12 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. * - * Copyright 2007 Develer S.r.l. (http://www.develer.com/) + * Copyright 2011 Develer S.r.l. (http://www.develer.com/) * --> * * \brief Function library for secure digital memory. * - * \author Francesco Sacchi + * \author Daniele Basile */ @@ -55,20 +55,41 @@ #include /* 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_STATUS_ERROR BV(19) + +#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[] = { @@ -290,7 +311,6 @@ int sd_sendIfCond(Sd *sd) return 0; } LOG_ERR("IF_COND: %lx\n", (sd->status)); - return -1; } @@ -318,8 +338,6 @@ 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"); } } @@ -412,6 +430,7 @@ int sd_appStatus(Sd *sd) if (hsmci_sendCmd(13, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_48_BIT)) { LOG_ERR("STATUS: %lx\n", HSMCI_SR); + sd->status |= SD_STATUS_ERROR; return -1; } @@ -434,6 +453,7 @@ INLINE int sd_cardSelection(Sd *sd, uint32_t rca) if (hsmci_sendCmd(7, rca, HSMCI_CMDR_RSPTYP_R1B)) { LOG_ERR("SELECT_SD: %lx\n", HSMCI_SR); + sd->status |= SD_STATUS_ERROR; return -1; } @@ -559,7 +579,7 @@ int sd_getStatus(Sd *sd, SdSSR *ssr, uint32_t *buf, size_t words) ASSERT(ssr); // Status reply with 512bit data, so the block size in byte is 64 - hsmci_prgRxDMA(buf, words, 64); + hsmci_read(buf, words, 64); if (hsmci_sendCmd(55, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_48_BIT)) { @@ -567,8 +587,8 @@ int sd_getStatus(Sd *sd, SdSSR *ssr, uint32_t *buf, size_t words) return -1; } - uint32_t status = HSMCI_RSPR; - if (status & (SD_STATUS_APP_CMD | SD_STATUS_READY)) + hsmci_readResp(&(sd->status), 1); + if (sd->status & (SD_STATUS_APP_CMD | SD_STATUS_READY)) { if (hsmci_sendCmd(13, 0, HSMCI_CMDR_RSPTYP_48_BIT | BV(HSMCI_CMDR_TRDIR) | HSMCI_CMDR_TRCMD_START_DATA | HSMCI_CMDR_TRTYP_SINGLE)) @@ -604,20 +624,25 @@ 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); } static size_t sd_SdReadDirect(struct KBlock *b, block_idx_t idx, void *buf, size_t offset, size_t size) { ASSERT(buf); + ASSERT(!((uint32_t)buf & 0x3)); + Sd *sd = SD_CAST(b); LOG_INFO("reading from block %ld, offset %d, size %d\n", idx, offset, size); if (sd_selectCard(sd) < 0) + { + sd->status |= SD_STATUS_ERROR; return -1; + } - hsmci_prgRxDMA(buf, size / 4, sd->b.blk_size); + hsmci_read(buf, size / 4, sd->b.blk_size); if (hsmci_sendCmd(17, idx * sd->b.blk_size + offset, HSMCI_CMDR_RSPTYP_48_BIT | BV(HSMCI_CMDR_TRDIR) | HSMCI_CMDR_TRCMD_START_DATA | HSMCI_CMDR_TRTYP_SINGLE)) @@ -646,14 +671,19 @@ static size_t sd_SdReadDirect(struct KBlock *b, block_idx_t idx, void *buf, size static size_t sd_SdWriteDirect(KBlock *b, block_idx_t idx, const void *buf, size_t offset, size_t size) { ASSERT(buf); + ASSERT(!((uint32_t)buf & 0x3)); + Sd *sd = SD_CAST(b); const uint32_t *_buf = (const uint32_t *)buf; LOG_INFO("reading from block %ld, offset %d, size %d\n", idx, offset, size); if (sd_selectCard(sd) < 0) - return 0; + { + sd->status |= SD_STATUS_ERROR; + return -1; + } - hsmci_prgTxDMA(_buf, size / 4, sd->b.blk_size); + hsmci_write(_buf, size / 4, sd->b.blk_size); if (hsmci_sendCmd(24, idx * sd->b.blk_size + offset, HSMCI_CMDR_RSPTYP_48_BIT | HSMCI_CMDR_TRCMD_START_DATA | HSMCI_CMDR_TRTYP_SINGLE)) @@ -683,7 +713,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 +724,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 +790,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 +805,7 @@ static bool sd_blockInit(Sd *sd, KFile *ch) return true; } } - + LOG_ERR("SD not ready.\n"); return false; }