diff options
| author | Bernard Xiong <[email protected]> | 2018-09-10 11:36:12 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-09-10 11:36:12 +0800 |
| commit | 6b5948f7357419bca4b7c60c2d7d3b502bce4ea0 (patch) | |
| tree | 3e79604ef65bc5a105c39fd5ceed399edd796a9b /components/drivers | |
| parent | b1065e3bb06ccbe5cfc516e02e01217fd81b4ec6 (diff) | |
| parent | 9fd4f6a1594ffadb85adb9b301e45be42de40239 (diff) | |
Merge pull request #1786 from weety/dev
[sdio] Fixed issue for requset size calculation.
Diffstat (limited to 'components/drivers')
| -rw-r--r-- | components/drivers/sdio/block_dev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/components/drivers/sdio/block_dev.c b/components/drivers/sdio/block_dev.c index cb1cee732a..34aa42eacd 100644 --- a/components/drivers/sdio/block_dev.c +++ b/components/drivers/sdio/block_dev.c @@ -259,11 +259,12 @@ static rt_size_t rt_mmcsd_read(rt_device_t dev, rt_sem_take(part->lock, RT_WAITING_FOREVER); while (remain_size) { - req_size = (size > blk_dev->max_req_size) ? blk_dev->max_req_size : remain_size; + req_size = (remain_size > blk_dev->max_req_size) ? blk_dev->max_req_size : remain_size; err = rt_mmcsd_req_blk(blk_dev->card, part->offset + pos + offset, rd_ptr, req_size, 0); if (err) break; offset += req_size; + rd_ptr = (void *)((rt_uint8_t *)rd_ptr + (req_size << 9)); remain_size -= req_size; } rt_sem_release(part->lock); @@ -299,11 +300,12 @@ static rt_size_t rt_mmcsd_write(rt_device_t dev, rt_sem_take(part->lock, RT_WAITING_FOREVER); while (remain_size) { - req_size = (size > blk_dev->max_req_size) ? blk_dev->max_req_size : remain_size; + req_size = (remain_size > blk_dev->max_req_size) ? blk_dev->max_req_size : remain_size; err = rt_mmcsd_req_blk(blk_dev->card, part->offset + pos + offset, wr_ptr, req_size, 1); if (err) break; offset += req_size; + wr_ptr = (void *)((rt_uint8_t *)wr_ptr + (req_size << 9)); remain_size -= req_size; } rt_sem_release(part->lock); |
