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

AMS Sansa: Remove a now redundant sd_wait_for_state() and adjust error codes in ata_sd_as3525.c

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23698 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jack Halpin 2009-11-22 14:13:39 +00:00
parent f620103925
commit ecbb01fe0a
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
firmware/target/arm/as3525/ata_sd_as3525.c
View file

@ -662,13 +662,6 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
last_disk_activity = current_tick; last_disk_activity = current_tick;
ret = sd_wait_for_state(drive, SD_TRAN);
if (ret < 0)
{
ret -= 20;
goto sd_transfer_error;
}
dma_retain(); dma_retain();
while(count) while(count)
@ -692,7 +685,7 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
ret = sd_select_bank(bank); ret = sd_select_bank(bank);
if (ret < 0) if (ret < 0)
{ {
ret -= 2*20; ret -= 20;
goto sd_transfer_error; goto sd_transfer_error;
} }
} }
@ -718,13 +711,13 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
ret = sd_wait_for_state(drive, SD_TRAN); ret = sd_wait_for_state(drive, SD_TRAN);
if (ret < 0) if (ret < 0)
{ {
ret -= 3*20; ret -= 2*20;
goto sd_transfer_error; goto sd_transfer_error;
} }
if(!send_cmd(drive, cmd, bank_start, MCI_ARG, NULL)) if(!send_cmd(drive, cmd, bank_start, MCI_ARG, NULL))
{ {
ret -= 4*20; ret -= 3*20;
goto sd_transfer_error; goto sd_transfer_error;
} }
@ -770,7 +763,7 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
if(!send_cmd(drive, SD_STOP_TRANSMISSION, 0, MCI_NO_FLAGS, NULL)) if(!send_cmd(drive, SD_STOP_TRANSMISSION, 0, MCI_NO_FLAGS, NULL))
{ {
ret = -5*20; ret = -4*20;
goto sd_transfer_error; goto sd_transfer_error;
} }
} }