From ecbb01fe0aa1a93cd4caa682196dcfb3272a1c06 Mon Sep 17 00:00:00 2001 From: Jack Halpin Date: Sun, 22 Nov 2009 14:13:39 +0000 Subject: AMS Sansa: Remove a now redundant sd_wait_for_state() and adjust error codes in ata_sd_as3525.c git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23698 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/as3525/ata_sd_as3525.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c index 4c1278b58f..05cbd327d5 100644 --- a/firmware/target/arm/as3525/ata_sd_as3525.c +++ b/firmware/target/arm/as3525/ata_sd_as3525.c @@ -662,13 +662,6 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start, last_disk_activity = current_tick; - ret = sd_wait_for_state(drive, SD_TRAN); - if (ret < 0) - { - ret -= 20; - goto sd_transfer_error; - } - dma_retain(); while(count) @@ -692,7 +685,7 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start, ret = sd_select_bank(bank); if (ret < 0) { - ret -= 2*20; + ret -= 20; 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); if (ret < 0) { - ret -= 3*20; + ret -= 2*20; goto sd_transfer_error; } if(!send_cmd(drive, cmd, bank_start, MCI_ARG, NULL)) { - ret -= 4*20; + ret -= 3*20; 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)) { - ret = -5*20; + ret = -4*20; goto sd_transfer_error; } } -- cgit