Changeset 366e9b6 in mainline for uspace/lib/usbhost

Timestamp:

2017-10-13T11:13:32Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

c10daa8

Parents:

cb69854

Message:

usbhost: setup of the root hub is now a method of an driver

[oue]hci + vhc still use the previous implementation, renamed to hcd_setup_virtual_root_hub. xhci currently does not do anything, so the virtual hub is not created anymore.

Location:

uspace/lib/usbhost

Files:

• include/usb/host/ddf_helpers.h (modified) (3 diffs)
• src/ddf_helpers.c (modified) (2 diffs)

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

@@ -49 +49 @@
 typedef int (*claim_t)(hcd_t *, ddf_dev_t *);
 typedef int (*driver_start_t)(hcd_t *, bool irq);
+typedef int (*setup_root_hub_t)(ddf_dev_t *);
 
 typedef void (*driver_stop_t)(hcd_t *);
@@ -68 +69 @@
         irq_code_gen_t irq_code_gen;       /**< Generate IRQ handling code */
         driver_start_t start;              /**< Start the HC */
+        setup_root_hub_t setup_root_hub;   /**< Setup the root hub */
 
         /* Destruction sequence: */
@@ -78 +80 @@
 int hcd_ddf_setup_hc(ddf_dev_t *device);
 void hcd_ddf_clean_hc(ddf_dev_t *device);
-int hcd_ddf_setup_root_hub(ddf_dev_t *device);
+
+int hcd_setup_virtual_root_hub(ddf_dev_t *);
 
 hcd_t *dev_to_hcd(ddf_dev_t *dev);

uspace/lib/usbhost/src/ddf_helpers.c

@@ -617 +617 @@
  * @return Error code
  */
-int hcd_ddf_setup_root_hub(ddf_dev_t *device)
+int hcd_setup_virtual_root_hub(ddf_dev_t *device)
 {
         assert(device);
@@ -919 +919 @@
          * needs to be ready at this time.
          */
-        ret = hcd_ddf_setup_root_hub(device);
+        if (driver->setup_root_hub)
+                ret = driver->setup_root_hub(device);
         if (ret != EOK) {
                 usb_log_error("Failed to setup HC root hub: %s.\n",