Changeset 17873ac7 in mainline for uspace/drv/bus/usb/uhci/transfer_list.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/drv/bus/usb/uhci/transfer_list.c (modified) (2 diffs)

uspace/drv/bus/usb/uhci/transfer_list.c

@@ -115 +115 @@
         assert(instance);
         assert(uhci_batch);
+
+        endpoint_t *ep = uhci_batch->base.ep;
+
+        /* First, wait until the endpoint is free to use */
+        fibril_mutex_lock(&ep->guard);
+        endpoint_activate_locked(ep, &uhci_batch->base);
+        fibril_mutex_unlock(&ep->guard);
+
         usb_log_debug2("Batch %p adding to queue %s.\n",
             uhci_batch, instance->name);
@@ -189 +197 @@
                     uhci_transfer_batch_from_link(current);
                 transfer_list_remove_batch(instance, batch);
-                uhci_transfer_batch_abort(batch);
+                endpoint_abort(batch->base.ep);
         }
         fibril_mutex_unlock(&instance->guard);