Changeset 17873ac7 in mainline for uspace/lib/usbhost/include/usb

Timestamp:

2017-10-31T19:06:57Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

479e32d

Parents:

a312d8f

Message:

usbhost endpoint: endpoint→active replaced by tracking active batch

The mechanism is optional, synchronization over endpoint is now not forced. It will be used by xhci to utilize streams.

Location:

uspace/lib/usbhost/include/usb/host

Files:

• bus.h (modified) (2 diffs)
• endpoint.h (modified) (3 diffs)
• usb_transfer_batch.h (modified) (3 diffs)

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

@@ -44 +44 @@
 
 #include <usb/usb.h>
+#include <usb/request.h>
 
 #include <assert.h>
@@ -97 +98 @@
         int (*release_address)(bus_t *, usb_address_t);
 
-        int (*reset_toggle)(bus_t *, usb_target_t, bool);
+        int (*reset_toggle)(bus_t *, usb_target_t, toggle_reset_mode_t);
 
         size_t (*count_bw) (endpoint_t *, size_t);

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

@@ -52 +52 @@
 /** Host controller side endpoint structure. */
 typedef struct endpoint {
+        /** Part of linked list. */
+        link_t link;
         /** Managing bus */
         bus_t *bus;
         /** Reference count. */
         atomic_t refcnt;
-        /** Part of linked list. */
-        link_t link;
         /** USB device */
         device_t *device;
@@ -76 +76 @@
         /** Value of the toggle bit. */
         unsigned toggle:1;
-        /** True if there is a batch using this scheduled for this endpoint. */
-        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;
@@ -91 +91 @@
 extern void endpoint_del_ref(endpoint_t *);
 
-extern void endpoint_use(endpoint_t *);
-extern void endpoint_release(endpoint_t *);
+/* Pay atention to synchronization of batch access wrt to aborting & finishing from another fibril. */
+
+/* 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 *, unsigned);
+extern void endpoint_toggle_set(endpoint_t *, bool);
 
 /** list_get_instance wrapper.

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

@@ -40 +40 @@
 #include <usb/request.h>
 
+#include <atomic.h>
 #include <stddef.h>
+#include <errno.h>
 #include <stdint.h>
 #include <usbhc_iface.h>
@@ -86 +88 @@
         /** Size of memory pointed to by buffer member */
         size_t buffer_size;
-
         /** Actually used portion of the buffer */
         size_t transfered_size;
+
         /** Indicates success/failure of the communication */
         int error;
@@ -106 +108 @@
         (batch).buffer_size, (batch).ep->max_packet_size
 
+/** Wrapper for bus operation. */
+usb_transfer_batch_t *usb_transfer_batch_create(endpoint_t *);
+
+/** Batch initializer. */
 void usb_transfer_batch_init(usb_transfer_batch_t *, endpoint_t *);
+
+/** Call after status is known, but before releasing endpoint */
+int usb_transfer_batch_reset_toggle(usb_transfer_batch_t *);
+
+/** Batch finalization. */
+void usb_transfer_batch_abort(usb_transfer_batch_t *);
 void usb_transfer_batch_finish(usb_transfer_batch_t *);
 
-usb_transfer_batch_t *usb_transfer_batch_create(endpoint_t *);
+/** To be called from outside only when the transfer is not going to be finished
+ * (i.o.w. until successfuly scheduling)
+ */
 void usb_transfer_batch_destroy(usb_transfer_batch_t *);