feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(sdmmc): Improve SD card state checking after write/read command

Browse Source
This commit is contained in:
Adam Múdry
2024-10-15 22:28:26 +02:00
committed by BOT
parent f7faec9bee
commit 20e0788361
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/driver/include/driver/sdmmc_defs.h
View File

@@ -109,6 +109,7 @@ extern "C" {
#define MMC_R1_CURRENT_STATE_POS (9) #define MMC_R1_CURRENT_STATE_POS (9)
#define MMC_R1_CURRENT_STATE_MASK (0x1E00)/* card current state */ #define MMC_R1_CURRENT_STATE_MASK (0x1E00)/* card current state */
#define MMC_R1_CURRENT_STATE_TRAN (4) #define MMC_R1_CURRENT_STATE_TRAN (4)
#define MMC_R1_CURRENT_STATE_STATUS(status) ((status & MMC_R1_CURRENT_STATE_MASK) >> MMC_R1_CURRENT_STATE_POS)
/* SPI mode R1 response type bits */ /* SPI mode R1 response type bits */
#define SD_SPI_R1_IDLE_STATE (1<<0) #define SD_SPI_R1_IDLE_STATE (1<<0)
@@ -425,7 +426,7 @@ extern "C" {
* *
* 67 45 23 01 ef cd ab 89 * 67 45 23 01 ef cd ab 89
* *
* MMC_RSP_BITS will extact bits as follows: * MMC_RSP_BITS will extract bits as follows:
* *
* start=0 len=4 -> result=0x00000007 * start=0 len=4 -> result=0x00000007
* start=0 len=12 -> result=0x00000567 * start=0 len=12 -> result=0x00000567

9
components/sdmmc/sdmmc_cmd.c
View File

@@ -416,6 +416,11 @@ esp_err_t sdmmc_write_sectors(sdmmc_card_t* card, const void* src,
return err; return err;
} }
static bool mmc_ready_for_data(uint32_t status)
{
return (status & MMC_R1_READY_FOR_DATA) && (MMC_R1_CURRENT_STATE_STATUS(status) == MMC_R1_CURRENT_STATE_TRAN);
}
esp_err_t sdmmc_write_sectors_dma(sdmmc_card_t* card, const void* src, esp_err_t sdmmc_write_sectors_dma(sdmmc_card_t* card, const void* src,
size_t start_block, size_t block_count) size_t start_block, size_t block_count)
{ {
@@ -448,7 +453,7 @@ esp_err_t sdmmc_write_sectors_dma(sdmmc_card_t* card, const void* src,
uint32_t status = 0; uint32_t status = 0;
size_t count = 0; size_t count = 0;
/* SD mode: wait for the card to become idle based on R1 status */ /* SD mode: wait for the card to become idle based on R1 status */
while (!host_is_spi(card) && !(status & MMC_R1_READY_FOR_DATA)) { while (!host_is_spi(card) && !mmc_ready_for_data(status)) {
// TODO: add some timeout here // TODO: add some timeout here
err = sdmmc_send_cmd_send_status(card, &status); err = sdmmc_send_cmd_send_status(card, &status);
if (err != ESP_OK) { if (err != ESP_OK) {
@@ -543,7 +548,7 @@ esp_err_t sdmmc_read_sectors_dma(sdmmc_card_t* card, void* dst,
} }
uint32_t status = 0; uint32_t status = 0;
size_t count = 0; size_t count = 0;
while (!host_is_spi(card) && !(status & MMC_R1_READY_FOR_DATA)) { while (!host_is_spi(card) && !mmc_ready_for_data(status)) {
// TODO: add some timeout here // TODO: add some timeout here
err = sdmmc_send_cmd_send_status(card, &status); err = sdmmc_send_cmd_send_status(card, &status);
if (err != ESP_OK) { if (err != ESP_OK) {

4
components/sdmmc/sdmmc_mmc.c
View File

@@ -263,8 +263,8 @@ esp_err_t sdmmc_init_mmc_check_ext_csd(sdmmc_card_t* card)
ESP_LOGE(TAG, "%s: send_status returned 0x%x", __func__, err); ESP_LOGE(TAG, "%s: send_status returned 0x%x", __func__, err);
goto out; goto out;
} }
status = ((status & MMC_R1_CURRENT_STATE_MASK) >> MMC_R1_CURRENT_STATE_POS);
if (status != MMC_R1_CURRENT_STATE_TRAN) { if (MMC_R1_CURRENT_STATE_STATUS(status) != MMC_R1_CURRENT_STATE_TRAN) {
ESP_LOGE(TAG, "%s: card not in transfer state", __func__); ESP_LOGE(TAG, "%s: card not in transfer state", __func__);
err = ESP_ERR_INVALID_STATE; err = ESP_ERR_INVALID_STATE;
goto out; goto out;