Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB: Thread must remember that a host has been detected since the POWERED state is ambiguous when waiting for host. Storage access is not yet actually exclusive if not USB_INSERTED. usb_start_monitoring seems better posting USB_UNPOWERED only if USB_EXTRACTED, interpreting POWERED/INSERTED as POWERED.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29153 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2011-01-29 00:22:42 +00:00
parent 8855ac48db
commit 088aaac985
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
firmware/usb.c
View file

@ -373,6 +373,9 @@ static void usb_thread(void) NORETURN_ATTR;
#endif
static void usb_thread(void)
{
#ifdef USB_DELAYED_INSERT
bool host_detected = false;
#endif
int num_acks_to_expect = 0;
long last_broadcast_tick = current_tick;
struct queue_event ev;
@ -395,6 +398,11 @@ static void usb_thread(void)
#ifdef USB_DELAYED_INSERT
if(usb_state != USB_POWERED)
break;
if (host_detected)
break; /* Drivers configured but we're still USB_POWERED */
host_detected = true;
#else /* !USB_DELAYED_INSERT */
if(usb_state != USB_EXTRACTED)
break;
@ -490,6 +498,9 @@ static void usb_thread(void)
/* Ok to broadcast disconnect now */
usb_configure_drivers(USB_EXTRACTED);
#ifdef USB_DELAYED_INSERT
host_detected = false;
#endif
break;
/* USB_UNPOWERED: USB_EXTRACTED: */
@ -566,7 +577,7 @@ void usb_start_monitoring(void)
* before or during boot. */
#ifdef USB_DELAYED_INSERT
/* Filter the status - USB_INSERTED may happen later */
status = (status == USB_INSERTED) ? USB_POWERED : USB_UNPOWERED;
status = (status == USB_EXTRACTED) ? USB_UNPOWERED : USB_POWERED;
#endif
usb_status_event(status);
@ -749,7 +760,8 @@ bool usb_inserted(void)
#ifdef HAVE_USBSTACK
bool usb_exclusive_storage(void)
{
return exclusive_storage_access;
/* Storage isn't actually exclusive until slave mode has been entered */
return exclusive_storage_access && usb_state == USB_INSERTED;
}
#endif /* HAVE_USBSTACK */