diff options
author | nialv7 <nialv7@gmail.com> | 2014-09-17 23:10:31 -0400 |
---|---|---|
committer | Marcin Bukat <marcin.bukat@gmail.com> | 2014-10-02 12:59:25 +0200 |
commit | 4a396ac1edcbb3140de5da207bb97d24ba6acbf5 (patch) | |
tree | 5e14a0260db8381ba45180e3d08faaaab679101c /firmware | |
parent | f5e2c25cb8e12df34b5c90adc93206d3fe8e31ba (diff) | |
download | rockbox-4a396ac1edcbb3140de5da207bb97d24ba6acbf5.tar.gz rockbox-4a396ac1edcbb3140de5da207bb97d24ba6acbf5.zip |
ipod6g, ata: Fix audio drop off while waiting for ata not busy
Change-Id: Id8fe39593fe3e6c5f0801bfa47ee1e04f7e7045f
Reviewed-on: http://gerrit.rockbox.org/970
Reviewed-by: Marcin Bukat <marcin.bukat@gmail.com>
Tested: Nial Shui <nialv7@gmail.com>
Diffstat (limited to 'firmware')
-rwxr-xr-x | firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c index 955a33a595..38f9758c14 100755 --- a/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c +++ b/firmware/target/arm/s5l8702/ipod6g/storage_ata-ipod6g.c | |||
@@ -131,6 +131,7 @@ static int ata_wait_for_not_bsy(long timeout) | |||
131 | uint8_t csd = ata_read_cbr(&ATA_PIO_CSD); | 131 | uint8_t csd = ata_read_cbr(&ATA_PIO_CSD); |
132 | if (!(csd & BIT(7))) return 0; | 132 | if (!(csd & BIT(7))) return 0; |
133 | if (TIMEOUT_EXPIRED(startusec, timeout)) RET_ERR(0); | 133 | if (TIMEOUT_EXPIRED(startusec, timeout)) RET_ERR(0); |
134 | yield(); | ||
134 | } | 135 | } |
135 | } | 136 | } |
136 | 137 | ||
@@ -143,6 +144,7 @@ static int ata_wait_for_rdy(long timeout) | |||
143 | uint8_t dad = ata_read_cbr(&ATA_PIO_DAD); | 144 | uint8_t dad = ata_read_cbr(&ATA_PIO_DAD); |
144 | if (dad & BIT(6)) return 0; | 145 | if (dad & BIT(6)) return 0; |
145 | if (TIMEOUT_EXPIRED(startusec, timeout)) RET_ERR(1); | 146 | if (TIMEOUT_EXPIRED(startusec, timeout)) RET_ERR(1); |
147 | yield(); | ||
146 | } | 148 | } |
147 | } | 149 | } |
148 | 150 | ||
@@ -156,6 +158,7 @@ static int ata_wait_for_start_of_transfer(long timeout) | |||
156 | if (dad & BIT(0)) RET_ERR(1); | 158 | if (dad & BIT(0)) RET_ERR(1); |
157 | if ((dad & (BIT(7) | BIT(3))) == BIT(3)) return 0; | 159 | if ((dad & (BIT(7) | BIT(3))) == BIT(3)) return 0; |
158 | if (TIMEOUT_EXPIRED(startusec, timeout)) RET_ERR(2); | 160 | if (TIMEOUT_EXPIRED(startusec, timeout)) RET_ERR(2); |
161 | yield(); | ||
159 | } | 162 | } |
160 | } | 163 | } |
161 | 164 | ||