summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2009-02-22 13:24:58 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2009-02-22 13:24:58 +0000
commit65d404ff6a78c6e2135f3e4f1f9d5634bed0dfce (patch)
treee0fa7c7497bb8aa8bfefa5962640e09a08296a01 /firmware
parent0055f13707bdeeca5893c57541d73a84b6069f9f (diff)
downloadrockbox-65d404ff6a78c6e2135f3e4f1f9d5634bed0dfce.zip
rockbox-65d404ff6a78c6e2135f3e4f1f9d5634bed0dfce.tar.gz
rockbox-65d404ff6a78c6e2135f3e4f1f9d5634bed0dfce.tar.bz2
rockbox-65d404ff6a78c6e2135f3e4f1f9d5634bed0dfce.tar.xz
Submit FS#9863 by Boris Gjenero. Correct ATA wakeup and power on in case of SYS_USB_CONNECTED. This way HDDs are spun down properly afterwards before rebooting to USB.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20082 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/ata.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index 5f58297..38face0 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -955,10 +955,17 @@ static void ata_thread(void)
usb_acknowledge(SYS_USB_CONNECTED_ACK);
/* There is no need to force ATA power on */
#else
- if (poweroff) {
+ if (sleeping) {
mutex_lock(&ata_mtx);
ata_led(true);
- ata_power_on();
+ if (poweroff) {
+ ata_power_on();
+ poweroff = false;
+ }
+ else {
+ perform_soft_reset();
+ }
+ sleeping = false;
ata_led(false);
mutex_unlock(&ata_mtx);
}