Changeset 0ef03d7 in mainline

Timestamp:

2012-12-21T11:19:18Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

daf59d1

Parents:

53332b5b

Message:

libusbhost: Add speed and bw parameters to hcd_ddf_setup_device.

Location:

uspace

Files:

• drv/bus/usb/ehci/main.c (modified) (1 diff)
• drv/bus/usb/ohci/ohci.c (modified) (1 diff)
• drv/bus/usb/uhci/uhci.c (modified) (1 diff)
• lib/usbhost/include/usb/host/ddf_helpers.h (modified) (1 diff)
• lib/usbhost/src/ddf_helpers.c (modified) (5 diffs)

uspace/drv/bus/usb/ehci/main.c

@@ -88 +88 @@
             "Failed to disable legacy USB: %s.\n", str_error(ret));
 
-        /* TODO High Speed, no bandwidth */
-        ret = hcd_ddf_setup_device(device, NULL);       
+        /* High Speed, no bandwidth */
+        ret = hcd_ddf_setup_device(device, NULL, USB_SPEED_HIGH, 0, NULL);      
         CHECK_RET_RETURN(ret,
             "Failed to init generci hcd driver: %s\n", str_error(ret));

uspace/drv/bus/usb/ohci/ohci.c

@@ -132 +132 @@
 
         /* Initialize generic HCD driver */
-        ret = hcd_ddf_setup_device(device, NULL);
+        ret = hcd_ddf_setup_device(device, NULL, USB_SPEED_FULL,
+            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
         if (ret != EOK) {
                 unregister_interrupt_handler(device, irq);

uspace/drv/bus/usb/uhci/uhci.c

@@ -137 +137 @@
 
         ddf_fun_t *hc_fun = NULL;
-        ret = hcd_ddf_setup_device(device, &hc_fun);
+        ret = hcd_ddf_setup_device(device, &hc_fun, USB_SPEED_FULL,
+            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
         CHECK_RET_RETURN(ret, "Failed to setup UHCI HCD.\n");
         

uspace/lib/usbhost/include/usb/host/ddf_helpers.h

@@ -43 +43 @@
     usb_address_t address, usb_speed_t speed, const char *name,
     const match_id_list_t *mids);
-int hcd_ddf_setup_device(ddf_dev_t *device, ddf_fun_t **fun);
+int hcd_ddf_setup_device(ddf_dev_t *device, ddf_fun_t **hc_fun,
+    usb_speed_t max_speed, size_t bw, bw_count_func_t bw_count);
 int hcd_ddf_setup_hub(hcd_t *instance, usb_address_t *address, ddf_dev_t *dev);
 

uspace/lib/usbhost/src/ddf_helpers.c

@@ -176 +176 @@
         assert(device);
 
+        const usb_speed_t speed = instance->dev_manager.max_speed;
+
         int ret = usb_device_manager_request_address(&instance->dev_manager,
-            address, false, USB_SPEED_FULL);
+            address, false, speed);
         if (ret != EOK) {
                 usb_log_error("Failed to get root hub address: %s\n",
@@ -197 +199 @@
         ret = usb_endpoint_manager_add_ep(
             &instance->ep_manager, *address, 0,
-            USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64,
+            USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL, speed, 64,
             0, NULL, NULL);
         CHECK_RET_UNREG_RETURN(ret,
@@ -209 +211 @@
 
         ret = hcd_ddf_add_device(
-            instance, device, *address, USB_SPEED_FULL, "rh", &mid_list);
+            instance, device, *address, speed, "rh", &mid_list);
         CHECK_RET_UNREG_RETURN(ret,
             "Failed to add hcd device: %s.\n", str_error(ret));
@@ -227 +229 @@
  *  - registers interrupt handler
  */
-int hcd_ddf_setup_device(ddf_dev_t *device, ddf_fun_t **hc_fun)
+int hcd_ddf_setup_device(ddf_dev_t *device, ddf_fun_t **hc_fun,
+    usb_speed_t max_speed, size_t bw, bw_count_func_t bw_count)
 {
         if (device == NULL)
@@ -257 +260 @@
             "Failed to allocate HCD structure: %s.\n", str_error(ret));
 
-        hcd_init(hcd, USB_SPEED_FULL, BANDWIDTH_AVAILABLE_USB11,
-            bandwidth_count_usb11);
+        hcd_init(hcd, max_speed, bw, bw_count);
 
         ret = ddf_fun_bind(instance->hc_fun);