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

Timestamp:

2017-10-12T14:07:27Z (8 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/endpoint.h (modified) (6 diffs)

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

@@ -32 +32 @@
 /** @file
  *
+ * Endpoint structure is tightly coupled to the bus. The bus controls the
+ * life-cycle of endpoint. In order to keep endpoints lightweight, operations
+ * on endpoints are part of the bus structure.
+ *
  */
 #ifndef LIBUSBHOST_HOST_ENDPOINT_H
@@ -42 +46 @@
 #include <atomic.h>
 
+typedef struct bus bus_t;
+
 /** Host controller side endpoint structure. */
 typedef struct endpoint {
+        /** Managing bus */
+        bus_t *bus;
         /** Reference count. */
         atomic_t refcnt;
@@ -49 +57 @@
         link_t link;
         /** USB address. */
-        usb_address_t address;
-        /** USB endpoint number. */
-        usb_endpoint_t endpoint;
+        usb_target_t target;
         /** Communication direction. */
         usb_direction_t direction;
@@ -62 +68 @@
         /** Additional opportunities per uframe */
         unsigned packets;
-        /** Necessary bandwidth. */
+        /** Reserved bandwidth. */
         size_t bandwidth;
         /** Value of the toggle bit. */
         unsigned toggle:1;
         /** True if there is a batch using this scheduled for this endpoint. */
-        volatile bool active;
+        bool active;
         /** Protects resources and active status changes. */
         fibril_mutex_t guard;
@@ -77 +83 @@
                 unsigned port;
         } tt;
-        /** Optional device specific data. */
-        struct {
-                /** Device specific data. */
-                void *data;
-                /** Callback to get the value of toggle bit. */
-                int (*toggle_get)(void *);
-                /** Callback to set the value of toggle bit. */
-                void (*toggle_set)(void *, int);
-                /** Device slot id. */
-                uint8_t slot_id;
-        } hc_data;
+
+        /* This structure is meant to be extended by overriding. */
 } endpoint_t;
 
-extern endpoint_t *endpoint_create(usb_address_t, usb_endpoint_t,
-    usb_direction_t, usb_transfer_type_t, usb_speed_t, size_t, unsigned int,
-    size_t, usb_address_t, unsigned int);
-extern void endpoint_destroy(endpoint_t *);
+extern void endpoint_init(endpoint_t *, bus_t *);
 
 extern void endpoint_add_ref(endpoint_t *);
 extern void endpoint_del_ref(endpoint_t *);
-
-extern void endpoint_set_hc_data(endpoint_t *, void *, int (*)(void *),
-    void (*)(void *, int));
-extern void endpoint_clear_hc_data(endpoint_t *);
 
 extern void endpoint_use(endpoint_t *);
@@ -106 +96 @@
 
 extern int endpoint_toggle_get(endpoint_t *);
-extern void endpoint_toggle_set(endpoint_t *, int);
+extern void endpoint_toggle_set(endpoint_t *, unsigned);
 
 /** list_get_instance wrapper.