devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

small cleanup

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16473 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Frank Gevaerts 2008-03-02 00:43:45 +00:00
parent 014568590d
commit b879afd600
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
firmware/usb.c
View file

@ -73,7 +73,9 @@ static struct thread_entry *usb_thread_entry;
static struct event_queue usb_queue; static struct event_queue usb_queue;
static int last_usb_status; static int last_usb_status;
static bool usb_monitor_enabled; 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) \ #if defined(IPOD_COLOR) || defined(IPOD_4G) \
@ -243,7 +245,7 @@ static void usb_thread(void)
#endif /* USE_ROCKBOX_USB */ #endif /* USE_ROCKBOX_USB */
#ifdef HAVE_PRIORITY_SCHEDULING #ifdef HAVE_PRIORITY_SCHEDULING
thread_set_priority(usb_thread_entry,PRIORITY_REALTIME); thread_set_priority(usb_thread_entry,PRIORITY_REALTIME);
exclusive_disk = true; exclusive_ata_access = true;
#endif #endif
#else #else
@ -264,7 +266,7 @@ static void usb_thread(void)
case USB_EXTRACTED: case USB_EXTRACTED:
#ifdef HAVE_USBSTACK #ifdef HAVE_USBSTACK
usb_enable(false); usb_enable(false);
exclusive_disk = false; exclusive_ata_access = false;
#ifdef HAVE_PRIORITY_SCHEDULING #ifdef HAVE_PRIORITY_SCHEDULING
thread_set_priority(usb_thread_entry,PRIORITY_SYSTEM); thread_set_priority(usb_thread_entry,PRIORITY_SYSTEM);
#endif #endif
@ -423,7 +425,7 @@ void usb_acknowledge(long id)
void usb_init(void) void usb_init(void)
{ {
usb_state = USB_EXTRACTED; usb_state = USB_EXTRACTED;
exclusive_disk = false; exclusive_ata_access = false;
usb_monitor_enabled = false; usb_monitor_enabled = false;
countdown = -1; countdown = -1;
@ -505,14 +507,14 @@ bool usb_inserted(void)
#ifdef HAVE_USBSTACK #ifdef HAVE_USBSTACK
void usb_request_exclusive_ata(void) void usb_request_exclusive_ata(void)
{ {
if(!exclusive_disk) { if(!exclusive_ata_access) {
queue_post(&usb_queue, USB_REQUEST_DISK, 0); queue_post(&usb_queue, USB_REQUEST_DISK, 0);
} }
} }
bool usb_exclusive_ata(void) bool usb_exclusive_ata(void)
{ {
return exclusive_disk; return exclusive_ata_access;
} }
#endif #endif