Changeset 41924f30 in mainline for uspace/lib/usbhost/src/ddf_helpers.c

Timestamp:

2017-10-12T14:07:27Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

a5976973

Parents:

7e74911

Message:

WIP usbhost refactoring

This commit replaces callbacks with more systematic virtual-like inheritance-like solution. Currently breaks build of HelenOS, but both xhci and usbhost are buildable. More refactoring follows…

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (6 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -469 +469 @@
 
         /* This checks whether the default address is reserved and gets speed */
-        int ret = usb_bus_get_speed(&hcd->bus, USB_ADDRESS_DEFAULT, &speed);
+        int ret = bus_get_speed(hcd->bus, USB_ADDRESS_DEFAULT, &speed);
         if (ret != EOK) {
                 usb_log_error("Failed to verify speed: %s.", str_error(ret));
@@ -623 +623 @@
         assert(hcd);
 
-        hcd_reserve_default_address(hcd, hcd->bus.max_speed);
+        hcd_reserve_default_address(hcd, USB_SPEED_MAX);
         const int ret = hcd_ddf_new_device(device, NULL, 0);
         hcd_release_default_address(hcd);
@@ -639 +639 @@
  * This function does all the ddf work for hc driver.
  */
-int hcd_ddf_setup_hc(ddf_dev_t *device, usb_speed_t max_speed,
-    size_t bw, bw_count_func_t bw_count)
+int hcd_ddf_setup_hc(ddf_dev_t *device)
 {
         assert(device);
@@ -650 +649 @@
         }
         instance->root_hub = NULL;
-        hcd_init(&instance->hcd, max_speed, bw, bw_count);
+        hcd_init(&instance->hcd);
 
         int ret = ENOMEM;
@@ -851 +850 @@
 {
         assert(driver);
-        static const struct { size_t bw; bw_count_func_t bw_count; }bw[] = {
-            [USB_SPEED_FULL] = { .bw = BANDWIDTH_AVAILABLE_USB11,
-                                 .bw_count = bandwidth_count_usb11 },
-            [USB_SPEED_HIGH] = { .bw = BANDWIDTH_AVAILABLE_USB11,
-                                 .bw_count = bandwidth_count_usb11 },
-            [USB_SPEED_SUPER] = { .bw = BANDWIDTH_AVAILABLE_USB11,
-                                 .bw_count = bandwidth_count_usb11 },
-        };
 
         int ret = EOK;
-        const usb_speed_t speed = driver->hc_speed;
-        if (speed >= ARRAY_SIZE(bw) || bw[speed].bw == 0) {
-                usb_log_error("Driver `%s' reported unsupported speed: %s",
-                    driver->name, usb_str_speed(speed));
-                return ENOTSUP;
-        }
 
         hw_res_list_parsed_t hw_res;
@@ -877 +862 @@
         }
 
-        ret = hcd_ddf_setup_hc(device, speed, bw[speed].bw, bw[speed].bw_count);
+        ret = hcd_ddf_setup_hc(device);
         if (ret != EOK) {
                 usb_log_error("Failed to setup generic HCD.\n");