Changeset 0892663a in mainline for uspace/lib/usbhost/src/endpoint.c

Timestamp:

2018-01-11T04:14:37Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

9848c77

Parents:

bad4a05

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-11 03:59:03)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-11 04:14:37)

Message:

usbhost: device removal and off/onlining moved into the library

Also, it is just not possible to make generic transfer abortion. So the
current semantics of endpoint unregistering is also aborting the pending
transfer. As it is not yet implemented in XHCI, and the stub in UHCI is
missing the magic, it breaks offlining interrupt devices, such as mouse.

When finishing this commit, I came across the fact we need some more
synchronization above device. Guard can protect internal structures, but
it cannot synchronize multiple calls to offline, or offline & removal
between each other - they both need to allow driver to unregister
endpoints, and as such must release the guard.

File:

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

uspace/lib/usbhost/src/endpoint.c

@@ -124 +124 @@
 
 /**
+ * Wait until the endpoint have no transfer scheduled.
+ */
+void endpoint_wait_timeout_locked(endpoint_t *ep, suseconds_t timeout)
+{
+        assert(fibril_mutex_is_locked(&ep->guard));
+
+        while (ep->active_batch != NULL)
+                fibril_condvar_wait_timeout(&ep->avail, &ep->guard, timeout);
+}
+
+/**
  * Mark the endpoint as active and block access for further fibrils. If the
  * endpoint is already active, it will block on ep->avail condvar.
@@ -138 +149 @@
         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);
+
+        endpoint_wait_timeout_locked(ep, 0);
         ep->active_batch = batch;
 }
@@ -160 +169 @@
         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);
-        usb_transfer_batch_t *batch = ep->active_batch;
-        endpoint_deactivate_locked(ep);
-        fibril_mutex_unlock(&ep->guard);
-
-        if (batch)
-                usb_transfer_batch_abort(batch);
 }