This is the bug/patch tracker for Rockbox. Click here for more information.
Quick links: Bugs · Patches · Rockbox frontpage
FS#12497 - Reorganize USB initialization to make it work with FreeBSD
Attached to Project:
Rockbox
Opened by Bartosz Fabianowski (undo) - Friday, 30 December 2011, 21:34 GMT+2
Last edited by Frank Gevaerts (fg) - Wednesday, 04 January 2012, 23:21 GMT+2
Opened by Bartosz Fabianowski (undo) - Friday, 30 December 2011, 21:34 GMT+2
Last edited by Frank Gevaerts (fg) - Wednesday, 04 January 2012, 23:21 GMT+2
|
DetailsWhen USB_DETECT_BY_CORE is defined (as is the case for almost all targets), the Rockbox USB stack distinguishes between connections to a USB charger and a real USB host. Initially, a charger is assumed and all USB drivers are disabled. If a real USB host is present, the first control request it sends triggers the usb_drv_usb_detect_event() callback which in turn enables the USB HID and/or mass storage drivers. Unfortunately, the call to allocate_interfaces_and_endpoints() which should allocate the endpoints required by these drivers has already occurred at that point and cannot simply be repeated due to its side effects. Instead, the USB stack relies on the host issuing a reset that will cause allocate_interfaces_and_endpoints() to be run again. This reset is issued by Linux, Windows and OS X but not by other operating systems such as FreeBSD.
The attached patch implements a fix as discussed on IRC. A new function usb_set_host_present() ensures that USB HID and/or mass storage drivers are enabled *before* the handling of the first control request begins and allocate_interfaces_and_endpoints() is called. This new function is located in usb.c, cleaning up the USB code by removing the need for a callback from usb_core.c. The define that controls this functionality is therefore renamed from USB_DETECT_BY_CORE to USB_DETECT_BY_REQUEST. This patch has been tested with FreeBSD and Linux USB hosts. 
patch_usb.diff
(11.4 KiB)
firmware/target/arm/as3525/usb-as3525.c | 16 -- firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c | 7 - firmware/target/arm/rk27xx/usb-rk27xx.c | 5 firmware/target/arm/usb-fw-pp502x.c | 9 - firmware/target/arm/imx233/usb-imx233.c | 5 firmware/usb.c | 117 ++++++++---------- firmware/export/usb_drv.h | 1 firmware/export/config.h | 10 - firmware/export/usb.h | 3 firmware/usbstack/usb_core.c | 5 10 files changed, 60 insertions(+), 118 deletions(-) |
This task depends upon
Closed by Frank Gevaerts (fg)
Wednesday, 04 January 2012, 23:21 GMT+2
Reason for closing: Accepted
Additional comments about closing: Committed as r31582
Wednesday, 04 January 2012, 23:21 GMT+2
Reason for closing: Accepted
Additional comments about closing: Committed as r31582
Here's a minor tweak to have a consistent manner of setting usb_state (inside main thread loop) and keeping the code that changes usb_num_acks_to_expect nearby for easier viewing.
@frank: I don't see any change worth noting for "promiscuous" detection. It basically the same stuff as a bridge IC.
Also worth noting since I happened to notice when testing: the USB stack still isn't big enough. Screendump on gigabeat F went into an infinite loop, creating lots of .bmp images. Beast usage is 96% after screendump.