summaryrefslogtreecommitdiff
path: root/components/drivers/sdio
diff options
context:
space:
mode:
authorMan, Jianting (Meco) <[email protected]>2021-08-17 16:56:10 -0500
committerGitHub <[email protected]>2021-08-17 16:56:10 -0500
commit3e6578916f892e4456d9dff4bbd44590a0cb4bc8 (patch)
treeb98d9fe601ce62e17b37f5b971f0cc9f965fa0e3 /components/drivers/sdio
parent37a9231e6219b94f7cde8bdea9251e260c4bed18 (diff)
parent196f340e5d845efd005b57a2089e0642266a79be (diff)
Merge branch 'master' into security
Diffstat (limited to 'components/drivers/sdio')
-rw-r--r--components/drivers/sdio/block_dev.c12
-rw-r--r--components/drivers/sdio/mmc.c17
2 files changed, 10 insertions, 19 deletions
diff --git a/components/drivers/sdio/block_dev.c b/components/drivers/sdio/block_dev.c
index f2ce09a83f..2acbc44fa3 100644
--- a/components/drivers/sdio/block_dev.c
+++ b/components/drivers/sdio/block_dev.c
@@ -515,15 +515,3 @@ void rt_mmcsd_blk_remove(struct rt_mmcsd_card *card)
}
}
}
-
-/*
- * This function will initialize block device on the mmc/sd.
- *
- * @deprecated since 2.1.0, this function does not need to be invoked
- * in the system initialization.
- */
-int rt_mmcsd_blk_init(void)
-{
- /* nothing */
- return 0;
-}
diff --git a/components/drivers/sdio/mmc.c b/components/drivers/sdio/mmc.c
index 5aba3dba7a..bebfa39ea2 100644
--- a/components/drivers/sdio/mmc.c
+++ b/components/drivers/sdio/mmc.c
@@ -122,7 +122,7 @@ static int mmc_get_ext_csd(struct rt_mmcsd_card *card, rt_uint8_t **new_ext_csd)
*new_ext_csd = RT_NULL;
- if (GET_BITS(card->resp_cid, 122, 4) < 4)
+ if (GET_BITS(card->resp_csd, 122, 4) < 4)
return 0;
/*
@@ -300,10 +300,10 @@ static int mmc_select_bus_width(struct rt_mmcsd_card *card, rt_uint8_t *ext_csd)
MMCSD_BUS_WIDTH_1
};
struct rt_mmcsd_host *host = card->host;
- unsigned idx, bus_width = 0;
+ unsigned idx, trys, bus_width = 0;
int err = 0;
- if (GET_BITS(card->resp_cid, 122, 4) < 4)
+ if (GET_BITS(card->resp_csd, 122, 4) < 4)
return 0;
/*
@@ -335,10 +335,13 @@ static int mmc_select_bus_width(struct rt_mmcsd_card *card, rt_uint8_t *ext_csd)
if (err)
continue;
- bus_width = bus_widths[idx];
- mmcsd_set_bus_width(host, bus_width);
- mmcsd_delay_ms(20); //delay 10ms
- err = mmc_compare_ext_csds(card, ext_csd, bus_width);
+ for(trys = 0; trys < 5; trys++){
+ mmcsd_set_bus_width(host, bus_width);
+ mmcsd_delay_ms(10);
+ err = mmc_compare_ext_csds(card, ext_csd, bus_width);
+ if(!err)
+ break;
+ }
if (!err) {
err = bus_width;
break;