summaryrefslogtreecommitdiff
path: root/firmware/drivers
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2008-10-03 11:56:01 +0000
committerFrank Gevaerts <frank@gevaerts.be>2008-10-03 11:56:01 +0000
commit7fc446263f99aad5f0b2f9f674fde02e6eac4d5c (patch)
tree158744ca6d5027e9c5fba43f5ca1ff91b1ffbf06 /firmware/drivers
parent0acaecef819f69fb040c915152d491e6a2b5a682 (diff)
downloadrockbox-7fc446263f99aad5f0b2f9f674fde02e6eac4d5c.zip
rockbox-7fc446263f99aad5f0b2f9f674fde02e6eac4d5c.tar.gz
rockbox-7fc446263f99aad5f0b2f9f674fde02e6eac4d5c.tar.bz2
rockbox-7fc446263f99aad5f0b2f9f674fde02e6eac4d5c.tar.xz
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
Diffstat (limited to 'firmware/drivers')
-rw-r--r--firmware/drivers/ata.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index ca523d1..4dd858b 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -884,7 +884,7 @@ static void ata_thread(void)
static long last_sleep = 0;
struct queue_event ev;
static long last_seen_mtx_unlock = 0;
-#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
+#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER)
static bool usb_mode = false;
#endif
@@ -901,7 +901,7 @@ static void ata_thread(void)
last_seen_mtx_unlock = current_tick;
if (TIME_AFTER(current_tick, last_seen_mtx_unlock+(HZ*2)))
{
-#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
+#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER)
if(!usb_mode)
#endif
call_ata_idle_notifys(false);
@@ -914,7 +914,7 @@ static void ata_thread(void)
TIME_AFTER( current_tick,
last_disk_activity + sleep_timeout ) )
{
-#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
+#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER)
if(!usb_mode)
#endif
call_ata_idle_notifys(true);
@@ -949,7 +949,7 @@ static void ata_thread(void)
DEBUGF("ata_thread got SYS_USB_CONNECTED\n");
usb_acknowledge(SYS_USB_CONNECTED_ACK);
-#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
+#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER)
usb_mode = true;
#else
/* Wait until the USB cable is extracted again */
@@ -957,7 +957,7 @@ static void ata_thread(void)
#endif
break;
-#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
+#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER)
case SYS_USB_DISCONNECTED:
/* Tell the USB thread that we are ready again */
DEBUGF("ata_thread got SYS_USB_DISCONNECTED\n");
@@ -967,7 +967,7 @@ static void ata_thread(void)
#endif
#endif
case Q_SLEEP:
-#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
+#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER)
if(!usb_mode)
#endif
call_ata_idle_notifys(false);