libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1786 from weety/dev 

[sdio] Fixed issue for requset size calculation.
This commit is contained in:
Bernard Xiong 2018-09-10 11:36:12 +08:00 committed by GitHub
parent b1065e3bb0 9fd4f6a159
commit 6b5948f735
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,11 +259,12 @@ static rt_size_t rt_mmcsd_read(rt_device_t dev,
rt_sem_take(part->lock, RT_WAITING_FOREVER); rt_sem_take(part->lock, RT_WAITING_FOREVER);
while (remain_size) 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); err = rt_mmcsd_req_blk(blk_dev->card, part->offset + pos + offset, rd_ptr, req_size, 0);
if (err) if (err)
break; break;
offset += req_size; offset += req_size;
rd_ptr = (void *)((rt_uint8_t *)rd_ptr + (req_size << 9));
remain_size -= req_size; remain_size -= req_size;
} }
rt_sem_release(part->lock); 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); rt_sem_take(part->lock, RT_WAITING_FOREVER);
while (remain_size) 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); err = rt_mmcsd_req_blk(blk_dev->card, part->offset + pos + offset, wr_ptr, req_size, 1);
if (err) if (err)
break; break;
offset += req_size; offset += req_size;
wr_ptr = (void *)((rt_uint8_t *)wr_ptr + (req_size << 9));
remain_size -= req_size; remain_size -= req_size;
} }
rt_sem_release(part->lock); rt_sem_release(part->lock);