libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1833 from uestczyh222/sdio 

Fix some bugs for sdio
This commit is contained in:
Bernard Xiong 2018-09-30 12:01:06 +08:00 committed by GitHub
parent bce268c8ce 2e74539130
commit 0cd2c10627
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/drivers/sdio/block_dev.c
View File

@ -252,7 +252,7 @@ static rt_size_t rt_mmcsd_read(rt_device_t dev,
void *buffer,
rt_size_t size)
{
rt_err_t err;
rt_err_t err = 0;
rt_size_t offset = 0;
rt_size_t req_size = 0;
rt_size_t remain_size = size;
@ -293,7 +293,7 @@ static rt_size_t rt_mmcsd_write(rt_device_t dev,
const void *buffer,
rt_size_t size)
{
rt_err_t err;
rt_err_t err = 0;
rt_size_t offset = 0;
rt_size_t req_size = 0;
rt_size_t remain_size = size;

8
components/drivers/sdio/mmc.c
View File

@ -198,6 +198,12 @@ static int mmc_get_ext_csd(struct rt_mmcsd_card *card, rt_uint8_t **new_ext_csd)
*/
static int mmc_parse_ext_csd(struct rt_mmcsd_card *card, rt_uint8_t *ext_csd)
{
if(card == RT_NULL || ext_csd == RT_NULL)
{
LOG_E("emmc parse ext csd fail, invaild args");
return -1;
}
card->flags |= CARD_FLAG_HIGHSPEED;
card->hs_max_data_rate = 200000000;
@ -424,7 +430,7 @@ static rt_int32_t mmcsd_mmc_init_card(struct rt_mmcsd_host *host,
{
rt_int32_t err;
rt_uint32_t resp[4];
rt_uint32_t rocr;
rt_uint32_t rocr = 0;
rt_uint32_t max_data_rate;
rt_uint8_t *ext_csd = RT_NULL;
struct rt_mmcsd_card *card = RT_NULL;

2
components/drivers/sdio/sdio.c
View File

@ -140,6 +140,7 @@ rt_int32_t sdio_io_rw_direct(struct rt_mmcsd_card *card,
RT_ASSERT(card != RT_NULL);
RT_ASSERT(fn <= SDIO_MAX_FUNCTIONS);
RT_ASSERT(pdata != RT_NULL);
if (reg_addr & ~SDIO_ARG_CMD53_REG_MASK)
return -RT_ERROR;
@ -937,6 +938,7 @@ err3:
host->card->sdio_function[i] = RT_NULL;
rt_free(host->card);
host->card = RT_NULL;
break;
}
}
}