Changeset 41924f30 in mainline for uspace/drv/bus/usb/xhci/main.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/drv/bus/usb/xhci/main.c (modified) (2 diffs)

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

@@ -66 +66 @@
                 .schedule       = hcd_schedule,
                 .irq_hook       = hcd_interrupt,
-                .ep_add_hook    = endpoint_init,
-                .ep_remove_hook = endpoint_fini,
                 .status_hook    = hcd_status,
         }
@@ -83 +81 @@
                 goto err;
 
+        if ((err = xhci_bus_init(&hc->bus, hcd)))
+                goto err;
+
         if ((err = hc_init_memory(hc)))
                 goto err;
 
-        hcd_set_implementation(hcd, hc, &xhci_ddf_hc_driver.ops);
+        hcd_set_implementation(hcd, hc, &xhci_ddf_hc_driver.ops, &hc->bus.base);
 
         return EOK;