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

uspace/drv/bus/usb/xhci/endpoint.h

@@ -43 +43 @@
 #include <usb/host/hcd.h>
 
+typedef struct xhci_endpoint xhci_endpoint_t;
+typedef struct xhci_bus xhci_bus_t;
+
 enum {
         EP_TYPE_INVALID = 0,
@@ -56 +59 @@
 /** Connector structure linking endpoint context to the endpoint. */
 typedef struct xhci_endpoint {
+        endpoint_t base;        /**< Inheritance. Keep this first. */
+
         uint32_t slot_id;
 } xhci_endpoint_t;
 
-int endpoint_init(hcd_t *hcd, endpoint_t *ep);
-void endpoint_fini(hcd_t *hcd, endpoint_t *ep);
+int xhci_endpoint_init(xhci_endpoint_t *, xhci_bus_t *);
+void xhci_endpoint_fini(xhci_endpoint_t *);
 
-static inline xhci_endpoint_t * endpoint_get(const endpoint_t *ep)
+static inline xhci_endpoint_t * xhci_endpoint_get(endpoint_t *ep)
 {
         assert(ep);
-        return ep->hc_data.data;
+        return (xhci_endpoint_t *) ep;
 }