Changeset 41924f30 in mainline for uspace/lib/usbhost/include/usb/host/hcd.h

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/include/usb/host/hcd.h (modified) (4 diffs)

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

@@ -38 +38 @@
 
 #include <usb/host/endpoint.h>
-#include <usb/host/usb_bus.h>
+#include <usb/host/bus.h>
 #include <usb/host/usb_transfer_batch.h>
 #include <usb/usb.h>
@@ -71 +71 @@
 struct hcd {
         /** Endpoint manager. */
-        usb_bus_t bus;
+        bus_t *bus;
 
         /** Interrupt replacement fibril */
@@ -78 +78 @@
         /** Driver implementation */
         hcd_ops_t ops;
+
         /** Device specific driver data. */
         void * driver_data;
 };
 
-extern void hcd_init(hcd_t *, usb_speed_t, size_t, bw_count_func_t);
+extern void hcd_init(hcd_t *);
 
 static inline void hcd_set_implementation(hcd_t *hcd, void *data,
-    const hcd_ops_t *ops)
+    const hcd_ops_t *ops, bus_t *bus)
 {
         assert(hcd);
@@ -91 +92 @@
                 hcd->driver_data = data;
                 hcd->ops = *ops;
+                hcd->bus = bus;
         } else {
                 memset(&hcd->ops, 0, sizeof(hcd->ops));