diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2008-03-02 00:43:45 +0000 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2008-03-02 00:43:45 +0000 |
| commit | b879afd600b9ac4e7fa80687321d4f6633aecce0 (patch) | |
| tree | a8313a51025f87a4c17ef1d0d7270abbb7c8ce9a /firmware | |
| parent | 014568590d72729add3d508f7a1ab6a2ed6468fc (diff) | |
small cleanup
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16473 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/usb.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/firmware/usb.c b/firmware/usb.c index 725dd5ed1d..08eacb865b 100644 --- a/firmware/usb.c +++ b/firmware/usb.c @@ -73,7 +73,9 @@ static struct thread_entry *usb_thread_entry; static struct event_queue usb_queue; static int last_usb_status; static bool usb_monitor_enabled; -static bool exclusive_disk; +#ifdef HAVE_USBSTACK +static bool exclusive_ata_access; +#endif #if defined(IPOD_COLOR) || defined(IPOD_4G) \ @@ -243,7 +245,7 @@ static void usb_thread(void) #endif /* USE_ROCKBOX_USB */ #ifdef HAVE_PRIORITY_SCHEDULING thread_set_priority(usb_thread_entry,PRIORITY_REALTIME); - exclusive_disk = true; + exclusive_ata_access = true; #endif #else @@ -264,7 +266,7 @@ static void usb_thread(void) case USB_EXTRACTED: #ifdef HAVE_USBSTACK usb_enable(false); - exclusive_disk = false; + exclusive_ata_access = false; #ifdef HAVE_PRIORITY_SCHEDULING thread_set_priority(usb_thread_entry,PRIORITY_SYSTEM); #endif @@ -423,7 +425,7 @@ void usb_acknowledge(long id) void usb_init(void) { usb_state = USB_EXTRACTED; - exclusive_disk = false; + exclusive_ata_access = false; usb_monitor_enabled = false; countdown = -1; @@ -505,14 +507,14 @@ bool usb_inserted(void) #ifdef HAVE_USBSTACK void usb_request_exclusive_ata(void) { - if(!exclusive_disk) { + if(!exclusive_ata_access) { queue_post(&usb_queue, USB_REQUEST_DISK, 0); } } bool usb_exclusive_ata(void) { - return exclusive_disk; + return exclusive_ata_access; } #endif |