diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2008-10-03 11:56:01 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2008-10-03 11:56:01 +0000 |
commit | 7fc446263f99aad5f0b2f9f674fde02e6eac4d5c (patch) | |
tree | 158744ca6d5027e9c5fba43f5ca1ff91b1ffbf06 | |
parent | 0acaecef819f69fb040c915152d491e6a2b5a682 (diff) | |
download | rockbox-7fc446263f99aad5f0b2f9f674fde02e6eac4d5c.tar.gz rockbox-7fc446263f99aad5f0b2f9f674fde02e6eac4d5c.zip |
fix yellow. Don't do the spindown/usb things in the bootloader
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18696 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/drivers/ata.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index ca523d126f..4dd858bca9 100644 --- a/firmware/drivers/ata.c +++ b/firmware/drivers/ata.c | |||
@@ -884,7 +884,7 @@ static void ata_thread(void) | |||
884 | static long last_sleep = 0; | 884 | static long last_sleep = 0; |
885 | struct queue_event ev; | 885 | struct queue_event ev; |
886 | static long last_seen_mtx_unlock = 0; | 886 | static long last_seen_mtx_unlock = 0; |
887 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) | 887 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER) |
888 | static bool usb_mode = false; | 888 | static bool usb_mode = false; |
889 | #endif | 889 | #endif |
890 | 890 | ||
@@ -901,7 +901,7 @@ static void ata_thread(void) | |||
901 | last_seen_mtx_unlock = current_tick; | 901 | last_seen_mtx_unlock = current_tick; |
902 | if (TIME_AFTER(current_tick, last_seen_mtx_unlock+(HZ*2))) | 902 | if (TIME_AFTER(current_tick, last_seen_mtx_unlock+(HZ*2))) |
903 | { | 903 | { |
904 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) | 904 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER) |
905 | if(!usb_mode) | 905 | if(!usb_mode) |
906 | #endif | 906 | #endif |
907 | call_ata_idle_notifys(false); | 907 | call_ata_idle_notifys(false); |
@@ -914,7 +914,7 @@ static void ata_thread(void) | |||
914 | TIME_AFTER( current_tick, | 914 | TIME_AFTER( current_tick, |
915 | last_disk_activity + sleep_timeout ) ) | 915 | last_disk_activity + sleep_timeout ) ) |
916 | { | 916 | { |
917 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) | 917 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER) |
918 | if(!usb_mode) | 918 | if(!usb_mode) |
919 | #endif | 919 | #endif |
920 | call_ata_idle_notifys(true); | 920 | call_ata_idle_notifys(true); |
@@ -949,7 +949,7 @@ static void ata_thread(void) | |||
949 | DEBUGF("ata_thread got SYS_USB_CONNECTED\n"); | 949 | DEBUGF("ata_thread got SYS_USB_CONNECTED\n"); |
950 | usb_acknowledge(SYS_USB_CONNECTED_ACK); | 950 | usb_acknowledge(SYS_USB_CONNECTED_ACK); |
951 | 951 | ||
952 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) | 952 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER) |
953 | usb_mode = true; | 953 | usb_mode = true; |
954 | #else | 954 | #else |
955 | /* Wait until the USB cable is extracted again */ | 955 | /* Wait until the USB cable is extracted again */ |
@@ -957,7 +957,7 @@ static void ata_thread(void) | |||
957 | #endif | 957 | #endif |
958 | break; | 958 | break; |
959 | 959 | ||
960 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) | 960 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER) |
961 | case SYS_USB_DISCONNECTED: | 961 | case SYS_USB_DISCONNECTED: |
962 | /* Tell the USB thread that we are ready again */ | 962 | /* Tell the USB thread that we are ready again */ |
963 | DEBUGF("ata_thread got SYS_USB_DISCONNECTED\n"); | 963 | DEBUGF("ata_thread got SYS_USB_DISCONNECTED\n"); |
@@ -967,7 +967,7 @@ static void ata_thread(void) | |||
967 | #endif | 967 | #endif |
968 | #endif | 968 | #endif |
969 | case Q_SLEEP: | 969 | case Q_SLEEP: |
970 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) | 970 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER) |
971 | if(!usb_mode) | 971 | if(!usb_mode) |
972 | #endif | 972 | #endif |
973 | call_ata_idle_notifys(false); | 973 | call_ata_idle_notifys(false); |