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

Timestamp:

2017-10-31T19:06:57Z (6 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/usb_transfer_batch.c (modified) (3 diffs)

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -63 +63 @@
 void usb_transfer_batch_init(usb_transfer_batch_t *batch, endpoint_t *ep)
 {
-        endpoint_use(ep);
-
         memset(batch, 0, sizeof(*batch));
         batch->ep = ep;
 }
 
-/** Call the handler of the batch.
+/** Resolve resetting toggle.
  *
  * @param[in] batch Batch structure to use.
  */
-static int batch_complete(usb_transfer_batch_t *batch)
+int usb_transfer_batch_reset_toggle(usb_transfer_batch_t *batch)
 {
         assert(batch);
 
-        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " completed.\n",
-            batch, USB_TRANSFER_BATCH_ARGS(*batch));
+        if (batch->error != EOK || batch->toggle_reset_mode == RESET_NONE)
+                return EOK;
 
-        if (batch->error == EOK && batch->toggle_reset_mode != RESET_NONE) {
-                usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " resets %s",
-                    batch, USB_TRANSFER_BATCH_ARGS(*batch),
-                    batch->toggle_reset_mode == RESET_ALL ? "all EPs toggle" : "EP toggle");
-                bus_reset_toggle(batch->ep->bus, 
-                    batch->target, batch->toggle_reset_mode == RESET_ALL);
-        }
+        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " resets %s",
+            batch, USB_TRANSFER_BATCH_ARGS(*batch),
+            batch->toggle_reset_mode == RESET_ALL ? "all EPs toggle" : "EP toggle");
 
-        return batch->on_complete
-                ? batch->on_complete(batch)
-                : EOK;
+        return bus_reset_toggle(batch->ep->bus, batch->target, batch->toggle_reset_mode);
 }
 
@@ -114 +106 @@
                 free(batch);
         }
-
-        endpoint_release(batch->ep);
 }
 
@@ -126 +116 @@
 void usb_transfer_batch_finish(usb_transfer_batch_t *batch)
 {
-        const int err = batch_complete(batch);
-        if (err)
-                usb_log_warning("batch %p failed to complete: %s", batch, str_error(err));
+        assert(batch);
+        assert(batch->ep);
+
+        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " finishing.\n",
+            batch, USB_TRANSFER_BATCH_ARGS(*batch));
+
+        if (batch->on_complete) {
+                const int err = batch->on_complete(batch);
+                if (err)
+                        usb_log_warning("batch %p failed to complete: %s",
+                            batch, str_error(err));
+        }
 
         usb_transfer_batch_destroy(batch);
+}
+
+/** Finish a transfer batch as an aborted one.
+ *
+ * @param[in] batch Batch structure to use.
+ */
+void usb_transfer_batch_abort(usb_transfer_batch_t *batch)
+{
+        assert(batch);
+        assert(batch->ep);
+
+        batch->error = EAGAIN;
+        usb_transfer_batch_finish(batch);
 }