diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2008-10-15 19:05:00 +0000 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2008-10-15 19:05:00 +0000 |
| commit | 9e0ebcc4e696ce058a35441c85afaf608d1dd25c (patch) | |
| tree | 7c0eee77b6e51f809e6d8188aef7fbb80e394046 | |
| parent | 5491273f86cdd30017148f0d26578c3f409a79ba (diff) | |
Simplify preprocessor symbols a bit (FS#9457). Thanks to Alexander Levin
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18816 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/drivers/ata.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index 4dd858bca9..b80f615eb3 100644 --- a/firmware/drivers/ata.c +++ b/firmware/drivers/ata.c @@ -141,6 +141,10 @@ static void ata_lock_unlock(struct ata_lock *l) #define mutex_unlock ata_lock_unlock #endif /* MAX_PHYS_SECTOR_SIZE */ +#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER) +#define ALLOW_USB_SPINDOWN +#endif + static struct mutex ata_mtx SHAREDBSS_ATTR; static int ata_device; /* device 0 (master) or 1 (slave) */ @@ -884,7 +888,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) && !defined(BOOTLOADER) +#ifdef ALLOW_USB_SPINDOWN static bool usb_mode = false; #endif @@ -901,7 +905,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) && !defined(BOOTLOADER) +#ifdef ALLOW_USB_SPINDOWN if(!usb_mode) #endif call_ata_idle_notifys(false); @@ -914,7 +918,7 @@ static void ata_thread(void) TIME_AFTER( current_tick, last_disk_activity + sleep_timeout ) ) { -#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER) +#ifdef ALLOW_USB_SPINDOWN if(!usb_mode) #endif call_ata_idle_notifys(true); @@ -949,7 +953,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) && !defined(BOOTLOADER) +#ifdef ALLOW_USB_SPINDOWN usb_mode = true; #else /* Wait until the USB cable is extracted again */ @@ -957,7 +961,7 @@ static void ata_thread(void) #endif break; -#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER) +#ifdef ALLOW_USB_SPINDOWN case SYS_USB_DISCONNECTED: /* Tell the USB thread that we are ready again */ DEBUGF("ata_thread got SYS_USB_DISCONNECTED\n"); @@ -967,7 +971,7 @@ static void ata_thread(void) #endif #endif case Q_SLEEP: -#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && !defined(BOOTLOADER) +#ifdef ALLOW_USB_SPINDOWN if(!usb_mode) #endif call_ata_idle_notifys(false); |