diff options
author | Jack Halpin <jack.halpin@gmail.com> | 2009-11-22 14:13:39 +0000 |
---|---|---|
committer | Jack Halpin <jack.halpin@gmail.com> | 2009-11-22 14:13:39 +0000 |
commit | ecbb01fe0aa1a93cd4caa682196dcfb3272a1c06 (patch) | |
tree | 13f7137014cb9b537e89ca83baa3a39f1afd4dc6 | |
parent | f6201039252420cd8abbd3281de5141680732bee (diff) | |
download | rockbox-ecbb01fe0aa1a93cd4caa682196dcfb3272a1c06.tar.gz rockbox-ecbb01fe0aa1a93cd4caa682196dcfb3272a1c06.zip |
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
-rw-r--r-- | firmware/target/arm/as3525/ata_sd_as3525.c | 15 |
1 files 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, | |||
662 | 662 | ||
663 | last_disk_activity = current_tick; | 663 | last_disk_activity = current_tick; |
664 | 664 | ||
665 | ret = sd_wait_for_state(drive, SD_TRAN); | ||
666 | if (ret < 0) | ||
667 | { | ||
668 | ret -= 20; | ||
669 | goto sd_transfer_error; | ||
670 | } | ||
671 | |||
672 | dma_retain(); | 665 | dma_retain(); |
673 | 666 | ||
674 | while(count) | 667 | while(count) |
@@ -692,7 +685,7 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start, | |||
692 | ret = sd_select_bank(bank); | 685 | ret = sd_select_bank(bank); |
693 | if (ret < 0) | 686 | if (ret < 0) |
694 | { | 687 | { |
695 | ret -= 2*20; | 688 | ret -= 20; |
696 | goto sd_transfer_error; | 689 | goto sd_transfer_error; |
697 | } | 690 | } |
698 | } | 691 | } |
@@ -718,13 +711,13 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start, | |||
718 | ret = sd_wait_for_state(drive, SD_TRAN); | 711 | ret = sd_wait_for_state(drive, SD_TRAN); |
719 | if (ret < 0) | 712 | if (ret < 0) |
720 | { | 713 | { |
721 | ret -= 3*20; | 714 | ret -= 2*20; |
722 | goto sd_transfer_error; | 715 | goto sd_transfer_error; |
723 | } | 716 | } |
724 | 717 | ||
725 | if(!send_cmd(drive, cmd, bank_start, MCI_ARG, NULL)) | 718 | if(!send_cmd(drive, cmd, bank_start, MCI_ARG, NULL)) |
726 | { | 719 | { |
727 | ret -= 4*20; | 720 | ret -= 3*20; |
728 | goto sd_transfer_error; | 721 | goto sd_transfer_error; |
729 | } | 722 | } |
730 | 723 | ||
@@ -770,7 +763,7 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start, | |||
770 | 763 | ||
771 | if(!send_cmd(drive, SD_STOP_TRANSMISSION, 0, MCI_NO_FLAGS, NULL)) | 764 | if(!send_cmd(drive, SD_STOP_TRANSMISSION, 0, MCI_NO_FLAGS, NULL)) |
772 | { | 765 | { |
773 | ret = -5*20; | 766 | ret = -4*20; |
774 | goto sd_transfer_error; | 767 | goto sd_transfer_error; |
775 | } | 768 | } |
776 | } | 769 | } |