devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

sd-as3525v2.c Don't reset controller on every pass through the transfer loop.

Browse source 
The controller only needs to be reset if we had an error to clean up any leftover trash...

Move comment pertaining to retry variable so it's actually nearby.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25315 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jack Halpin 2010-03-24 05:41:25 +00:00
parent 66f011e8c1
commit 0466a11028
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
firmware/target/arm/as3525/sd-as3525v2.c
View file

@ -758,7 +758,6 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
const int cmd = write ? SD_WRITE_MULTIPLE_BLOCK : SD_READ_MULTIPLE_BLOCK;
/* Interrupt handler might set this to true during transfer */
do
{
void *dma_buf = aligned_buffer;
@ -769,15 +768,12 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
if(write)
memcpy(uncached_buffer, buf, transfer * SD_BLOCK_SIZE);
/* Interrupt handler might set this to true during transfer */
retry = false;
MCI_BLKSIZ = SD_BLOCK_SIZE;
MCI_BYTCNT = transfer * SD_BLOCK_SIZE;
MCI_CTRL |= (FIFO_RESET|DMA_RESET);
while(MCI_CTRL & (FIFO_RESET|DMA_RESET))
;
ret = sd_wait_for_state(drive, SD_TRAN);
if (ret < 0)
{
@ -833,6 +829,13 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
start += transfer;
count -= transfer;
}
else /* reset controller if we had an error */
{
MCI_CTRL |= (FIFO_RESET|DMA_RESET);
while(MCI_CTRL & (FIFO_RESET|DMA_RESET))
;
}
} while(retry || count);
dma_release();