Changeset 929599a8 in mainline for uspace/drv/bus/usb/uhci/uhci_batch.c

Timestamp:

2018-01-11T13:30: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:

4ed803f1

Parents:

351113f

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-11 13:30:31)

git-committer:

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

Message:

uhci: implemented transfer abort

File:

• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (1 diff)

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

@@ -64 +64 @@
 }
 
-/**
- * Abort a transfer that is currently running.
- * Call with endpoint guard locked.
- */
-void uhci_transfer_batch_abort(uhci_transfer_batch_t *batch)
-{
-        assert(batch);
-
-        endpoint_t *ep = batch->base.ep;
-        assert(ep);
-        assert(fibril_mutex_is_locked(&ep->guard));
-        assert(ep->active_batch == &batch->base);
-
-        /*
-         * TODO: Do some magic here to remove the batch from schedule.
-         */
-
-        /*
-         * Wait for 2 frames. If the transfer was being processed,
-         * it shall be marked as finished already after 1ms.
-         */
-        endpoint_wait_timeout_locked(ep, 2000);
-        if (ep->active_batch != &batch->base)
-                return;
-
-        /*
-         * Now, we can be sure the transfer is not scheduled,
-         * and as such will not be completed. We now own the batch.
-         */
-        endpoint_deactivate_locked(ep);
-
-        /* Leave the critical section for finishing the batch. */
-        fibril_mutex_unlock(&ep->guard);
-
-        batch->base.error = EINTR;
-        batch->base.transfered_size = 0;
-        usb_transfer_batch_finish(&batch->base);
-
-        fibril_mutex_lock(&ep->guard);
-}
-
 /** Allocate memory and initialize internal data structure.
  *