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

Timestamp:

2018-01-11T13:30:37Z (6 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/hc.c (modified) (4 diffs)

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

@@ -53 +53 @@
 
 #include "uhci_batch.h"
+#include "transfer_list.h"
 #include "hc.h"
 
@@ -323 +324 @@
 static void endpoint_unregister(endpoint_t *ep)
 {
+        hc_t * const hc = bus_to_hc(endpoint_get_bus(ep));
         usb2_bus_ops.endpoint_unregister(ep);
+
+        uhci_transfer_batch_t *batch = NULL;
 
         fibril_mutex_lock(&ep->guard);
         if (ep->active_batch) {
-                uhci_transfer_batch_t *ub = uhci_transfer_batch_get(ep->active_batch);
-                uhci_transfer_batch_abort(ub);
-
-                assert(ep->active_batch == NULL);
+                batch = uhci_transfer_batch_get(ep->active_batch);
+
+                transfer_list_t *list = hc->transfers[ep->device->speed][ep->transfer_type];
+                assert(list);
+
+                fibril_mutex_lock(&list->guard);
+                transfer_list_remove_batch(list, batch);
+                fibril_mutex_unlock(&list->guard);
+
+                endpoint_wait_timeout_locked(ep, 2000);
+
+                batch = uhci_transfer_batch_get(ep->active_batch);
+                if (ep->active_batch) {
+                        endpoint_deactivate_locked(ep);
+                }
         }
         fibril_mutex_unlock(&ep->guard);
+
+        if (batch) {
+                batch->base.error = EINTR;
+                batch->base.transfered_size = 0;
+                usb_transfer_batch_finish(&batch->base);
+        }
 }
 
@@ -486 +507 @@
 static int hc_schedule(usb_transfer_batch_t *batch)
 {
-        assert(batch);
-        hc_t *instance = bus_to_hc(endpoint_get_bus(batch->ep));
-
-        if (batch->target.address == uhci_rh_get_address(&instance->rh))
-                return uhci_rh_schedule(&instance->rh, batch);
-
-        uhci_transfer_batch_t *uhci_batch = (uhci_transfer_batch_t *) batch;
-        if (!uhci_batch) {
-                usb_log_error("Failed to create UHCI transfer structures.\n");
-                return ENOMEM;
-        }
+        uhci_transfer_batch_t *uhci_batch = uhci_transfer_batch_get(batch);
+        endpoint_t *ep = batch->ep;
+        hc_t *hc = bus_to_hc(endpoint_get_bus(ep));
+
+        if (batch->target.address == uhci_rh_get_address(&hc->rh))
+                return uhci_rh_schedule(&hc->rh, batch);
+
 
         const int err = uhci_transfer_batch_prepare(uhci_batch);
@@ -502 +519 @@
                 return err;
 
-        transfer_list_t *list =
-            instance->transfers[batch->ep->device->speed][batch->ep->transfer_type];
+        transfer_list_t *list = hc->transfers[ep->device->speed][ep->transfer_type];
         assert(list);
         transfer_list_add_batch(list, uhci_batch);
+
+        return EOK;
+}
+
+int hc_unschedule_batch(usb_transfer_batch_t *batch)
+{
 
         return EOK;