Changeset 0892663a in mainline for uspace/lib/usbhost/include/usb/host

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.

Location:

uspace/lib/usbhost/include/usb/host

Files:

• bus.h (modified) (1 diff)
• endpoint.h (modified) (2 diffs)
• usb_transfer_batch.h (modified) (1 diff)

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

@@ -105 +105 @@
         void (*device_remove)(device_t *);
         int (*device_online)(device_t *);                       /**< Optional */
-        int (*device_offline)(device_t *);                      /**< Optional */
+        void (*device_offline)(device_t *);                     /**< Optional */
         endpoint_t *(*endpoint_create)(device_t *, const usb_endpoint_descriptors_t *);
 

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

@@ -44 +44 @@
 #include <fibril_synch.h>
 #include <stdbool.h>
+#include <sys/time.h>
 #include <usb/usb.h>
 #include <usb/host/bus.h>
@@ -93 +94 @@
 extern void endpoint_del_ref(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_wait_timeout_locked(endpoint_t *ep, suseconds_t);
 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 *);
 
 /* Calculate bandwidth */

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

@@ -112 +112 @@
 
 /** Batch finalization. */
-void usb_transfer_batch_abort(usb_transfer_batch_t *);
 void usb_transfer_batch_finish(usb_transfer_batch_t *);