Changeset 17873ac7 in mainline for uspace/lib/usbhost/src/endpoint.c

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.

File:

• uspace/lib/usbhost/src/endpoint.c (modified) (7 diffs)

uspace/lib/usbhost/src/endpoint.c

@@ -36 +36 @@
 
 #include <usb/host/endpoint.h>
+#include <usb/host/usb_transfer_batch.h>
 #include <usb/host/bus.h>
 
@@ -68 +69 @@
                 }
                 else {
-                        assert(!ep->active);
+                        assert(ep->active_batch == NULL);
 
                         /* Assume mostly the eps will be allocated by malloc. */
@@ -79 +80 @@
  * @param ep endpoint_t structure.
  */
-void endpoint_use(endpoint_t *ep)
+void endpoint_activate_locked(endpoint_t *ep, usb_transfer_batch_t *batch)
 {
         assert(ep);
-        /* Add reference for active endpoint. */
-        endpoint_add_ref(ep);
-        fibril_mutex_lock(&ep->guard);
-        while (ep->active)
+        assert(batch);
+        assert(batch->ep == ep);
+        assert(fibril_mutex_is_locked(&ep->guard));
+
+        while (ep->active_batch != NULL)
                 fibril_condvar_wait(&ep->avail, &ep->guard);
-        ep->active = true;
-        fibril_mutex_unlock(&ep->guard);
+        ep->active_batch = batch;
 }
 
@@ -94 +95 @@
  * @param ep endpoint_t structure.
  */
-void endpoint_release(endpoint_t *ep)
+void endpoint_deactivate_locked(endpoint_t *ep)
 {
         assert(ep);
+        assert(fibril_mutex_is_locked(&ep->guard));
+
+        if (ep->active_batch && ep->active_batch->error == EOK)
+                usb_transfer_batch_reset_toggle(ep->active_batch);
+
+        ep->active_batch = NULL;
+        fibril_condvar_signal(&ep->avail);
+}
+
+/** Abort an active batch on endpoint, if any.
+ *
+ * @param[in] ep endpoint_t structure.
+ */
+void endpoint_abort(endpoint_t *ep)
+{
+        assert(ep);
+
         fibril_mutex_lock(&ep->guard);
-        ep->active = false;
+        usb_transfer_batch_t *batch = ep->active_batch;
+        endpoint_deactivate_locked(ep);
         fibril_mutex_unlock(&ep->guard);
-        fibril_condvar_signal(&ep->avail);
-        /* Drop reference for active endpoint. */
-        endpoint_del_ref(ep);
+
+        if (batch)
+                usb_transfer_batch_abort(batch);
 }
 
@@ -112 +131 @@
 {
         assert(ep);
-        fibril_mutex_lock(&ep->guard);
-        const int ret = ep->bus->ops.endpoint_get_toggle
+
+        return ep->bus->ops.endpoint_get_toggle
             ? ep->bus->ops.endpoint_get_toggle(ep)
             : ep->toggle;
-        fibril_mutex_unlock(&ep->guard);
-        return ret;
 }
 
@@ -124 +141 @@
  * @param ep endpoint_t structure.
  */
-void endpoint_toggle_set(endpoint_t *ep, unsigned toggle)
+void endpoint_toggle_set(endpoint_t *ep, bool toggle)
 {
         assert(ep);
-        assert(toggle == 0 || toggle == 1);
-        fibril_mutex_lock(&ep->guard);
+
         if (ep->bus->ops.endpoint_set_toggle) {
                 ep->bus->ops.endpoint_set_toggle(ep, toggle);
@@ -135 +151 @@
                 ep->toggle = toggle;
         }
-        fibril_mutex_unlock(&ep->guard);
 }