Changeset c10daa8 in mainline for uspace/drv/bus/usb/xhci/endpoint.h

Timestamp:

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

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

063dfe8

Parents:

366e9b6

Message:

Refactored XHCI bus to hold devices instead of endpoints. Added middle layer to keep track of endpoints within devices.

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_device xhci_device_t;
 typedef struct xhci_endpoint xhci_endpoint_t;
 typedef struct xhci_bus xhci_bus_t;
+
+#define XHCI_DEVICE_MAX_ENDPOINTS 32
 
 enum {
@@ -61 +64 @@
         endpoint_t base;        /**< Inheritance. Keep this first. */
 
+        xhci_device_t *device;
+} xhci_endpoint_t;
+
+typedef struct xhci_device {
+        usb_address_t address;
+
         uint32_t slot_id;
-} xhci_endpoint_t;
+
+        xhci_endpoint_t *endpoints[XHCI_DEVICE_MAX_ENDPOINTS];
+        uint8_t active_endpoint_count;
+} xhci_device_t;
 
 int xhci_endpoint_init(xhci_endpoint_t *, xhci_bus_t *);
 void xhci_endpoint_fini(xhci_endpoint_t *);
+
+int xhci_device_init(xhci_device_t *, xhci_bus_t *);
+void xhci_device_fini(xhci_device_t *);
+
+int xhci_device_add_endpoint(xhci_device_t *, xhci_endpoint_t *);
+int xhci_device_remove_endpoint(xhci_device_t *, xhci_endpoint_t *);
+xhci_endpoint_t * xhci_device_get_endpoint(xhci_device_t *, usb_endpoint_t);
 
 static inline xhci_endpoint_t * xhci_endpoint_get(endpoint_t *ep)