Changes in uspace/lib/usbhost/include/usb/host/endpoint.h [58563585:17873ac7] in mainline

File:

• uspace/lib/usbhost/include/usb/host/endpoint.h (modified) (4 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;
+typedef struct device device_t;
+typedef struct usb_transfer_batch usb_transfer_batch_t;
+
 /** Host controller side endpoint structure. */
 typedef struct endpoint {
-        /** Reference count. */
-        atomic_t refcnt;        
         /** Part of linked list. */
         link_t link;
-        /** USB address. */
-        usb_address_t address;
-        /** USB endpoint number. */
+        /** Managing bus */
+        bus_t *bus;
+        /** Reference count. */
+        atomic_t refcnt;
+        /** USB device */
+        device_t *device;
+        /** Enpoint number */
         usb_endpoint_t endpoint;
         /** Communication direction. */
@@ -62 +72 @@
         /** 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;
+        /** The currently active transfer batch. Write using methods, read under guard. */
+        usb_transfer_batch_t *active_batch;
         /** Protects resources and active status changes. */
         fibril_mutex_t guard;
         /** Signals change of active status. */
         fibril_condvar_t avail;
-        /** High speed TT data */
-        struct {
-                usb_address_t address;
-                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);
-        } 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 *);
+/* Pay atention to synchronization of batch access wrt to aborting & finishing from another fibril. */
 
-extern void endpoint_use(endpoint_t *);
-extern void endpoint_release(endpoint_t *);
+/* Set currently active batch. The common case is to activate in the same
+ * critical section as scheduling to HW.
+ */
+extern void endpoint_activate_locked(endpoint_t *, usb_transfer_batch_t *);
+
+/* Deactivate the endpoint, allowing others to activate it again. Batch shall
+ * already have an error set. */
+extern void endpoint_deactivate_locked(endpoint_t *);
+
+/* Abort the currenty active batch. */
+void endpoint_abort(endpoint_t *);
 
 extern int endpoint_toggle_get(endpoint_t *);
-extern void endpoint_toggle_set(endpoint_t *, int);
+extern void endpoint_toggle_set(endpoint_t *, bool);
 
 /** list_get_instance wrapper.
@@ -117 +119 @@
         return item ? list_get_instance(item, endpoint_t, link) : NULL;
 }
+
 #endif