summaryrefslogtreecommitdiffstats
path: root/firmware/usbstack
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2012-12-07 13:37:26 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2012-12-07 13:37:26 +0100
commit775ab07d5e710c4811a66b246f8f8708a09eba28 (patch)
treedf725ba1aea0bccbfb64e29d49fa04bfc671ec11 /firmware/usbstack
parentfb43a137e72d1f428efef00047a416497463edfb (diff)
downloadrockbox-775ab07d5e710c4811a66b246f8f8708a09eba28.tar.gz
rockbox-775ab07d5e710c4811a66b246f8f8708a09eba28.tar.bz2
rockbox-775ab07d5e710c4811a66b246f8f8708a09eba28.zip
usb: add support for hardware handled SET ADDR/CONFIG
Some USB controllers like the one of the Rockchip 27xx handle some requests in pure hardware. This is especially a problem for two of them: - SET ADDR which is used by our core to track the DEFAULT/ADDRESS state and is required for the drivers to work properly - SET CONFIG which is used by our core to initialise the drivers by calling init_connection() In these cases we need a way to notify the core that such requests happened. We do this by exporting two functions which directly notify the core about these requests and perform the necessary init steps required without doing the actual USB transfers. Special care is needed because these functions could be called from an interrupt handler. For this reason we still use the usb_queue and introduce new IDs so that they are processed in order and safely. No functional change is intended, both in the usbstack and on targets without such quirks. Change-Id: Ie42feffd4584e88bf37cff018b627f333dca1140
Diffstat (limited to 'firmware/usbstack')
-rw-r--r--firmware/usbstack/usb_core.c70
1 files changed, 53 insertions, 17 deletions
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c
index 801325b692..2a3cc1c525 100644
--- a/firmware/usbstack/usb_core.c
+++ b/firmware/usbstack/usb_core.c
@@ -663,10 +663,31 @@ static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req)
}
}
-static void request_handler_device(struct usb_ctrlrequest* req)
+static void usb_core_do_set_addr(uint8_t address)
{
- int i;
+ logf("usb_core: SET_ADR %d", address);
+ usb_address = address;
+ usb_state = ADDRESS;
+}
+
+static void usb_core_do_set_config(uint8_t config)
+{
+ logf("usb_core: SET_CONFIG");
+ if(config) {
+ usb_state = CONFIGURED;
+ for(int i = 0; i < USB_NUM_DRIVERS; i++)
+ if(drivers[i].enabled && drivers[i].init_connection)
+ drivers[i].init_connection();
+ }
+ else
+ usb_state = ADDRESS;
+ #ifdef HAVE_USB_CHARGING_ENABLE
+ usb_charging_maxcurrent_change(usb_charging_maxcurrent());
+ #endif
+}
+static void request_handler_device(struct usb_ctrlrequest* req)
+{
switch(req->bRequest) {
case USB_REQ_GET_CONFIGURATION: {
logf("usb_core: GET_CONFIG");
@@ -676,20 +697,9 @@ static void request_handler_device(struct usb_ctrlrequest* req)
break;
}
case USB_REQ_SET_CONFIGURATION: {
- logf("usb_core: SET_CONFIG");
usb_drv_cancel_all_transfers();
- if(req->wValue) {
- usb_state = CONFIGURED;
- for(i = 0; i < USB_NUM_DRIVERS; i++)
- if(drivers[i].enabled && drivers[i].init_connection)
- drivers[i].init_connection();
- }
- else
- usb_state = ADDRESS;
+ usb_core_do_set_config(req->wValue);
usb_drv_send(EP_CONTROL, NULL, 0);
-#ifdef HAVE_USB_CHARGING_ENABLE
- usb_charging_maxcurrent_change(usb_charging_maxcurrent());
-#endif
break;
}
case USB_REQ_SET_ADDRESS: {
@@ -697,9 +707,8 @@ static void request_handler_device(struct usb_ctrlrequest* req)
logf("usb_core: SET_ADR %d", address);
usb_drv_send(EP_CONTROL, NULL, 0);
usb_drv_cancel_all_transfers();
- usb_address = address;
- usb_drv_set_address(usb_address);
- usb_state = ADDRESS;
+ usb_drv_set_address(address);
+ usb_core_do_set_addr(address);
break;
}
case USB_REQ_GET_DESCRIPTOR:
@@ -913,6 +922,21 @@ void usb_core_transfer_complete(int endpoint, int dir, int status, int length)
}
}
+void usb_core_handle_notify(long id, intptr_t data)
+{
+ switch(id)
+ {
+ case USB_NOTIFY_SET_ADDR:
+ usb_core_do_set_addr(data);
+ break;
+ case USB_NOTIFY_SET_CONFIG:
+ usb_core_do_set_config(data);
+ break;
+ default:
+ break;
+ }
+}
+
/* called by usb_drv_int() */
void usb_core_control_request(struct usb_ctrlrequest* req)
{
@@ -928,6 +952,18 @@ void usb_core_control_request(struct usb_ctrlrequest* req)
usb_signal_transfer_completion(completion_event);
}
+void usb_core_notify_set_address(uint8_t addr)
+{
+ logf("notify set addr received %ld", current_tick);
+ usb_signal_notify(USB_NOTIFY_SET_ADDR, addr);
+}
+
+void usb_core_notify_set_config(uint8_t config)
+{
+ logf("notify set config received %ld", current_tick);
+ usb_signal_notify(USB_NOTIFY_SET_CONFIG, config);
+}
+
#ifdef HAVE_USB_CHARGING_ENABLE
void usb_charging_enable(int state)
{