Changeset d60115a in mainline for uspace/drv/bus/usb/ohci/hc.c

Timestamp:

2018-01-17T17:55:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8ad2b0a

Parents:

ed8575f

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-17 17:54:31)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-17 17:55:35)

Message:

ohci: implement transfer abort on endpoint unregister

File:

• uspace/drv/bus/usb/ohci/hc.c (modified) (4 diffs)

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

@@ -168 +168 @@
             hw_res->mem_ranges.ranges[0].size);
 
-        list_initialize(&instance->pending_batches);
+        list_initialize(&instance->pending_endpoints);
         fibril_mutex_initialize(&instance->guard);
 
@@ -304 +304 @@
                 return err;
 
-        fibril_mutex_lock(&hc->guard);
-        list_append(&ohci_batch->link, &hc->pending_batches);
+        endpoint_t *ep = batch->ep;
+        ohci_endpoint_t * const ohci_ep = ohci_endpoint_get(ep);
+
+        /* creating local reference */
+        endpoint_add_ref(ep);
+
+        fibril_mutex_lock(&ep->guard);
+        endpoint_activate_locked(ep, batch);
         ohci_transfer_batch_commit(ohci_batch);
+        fibril_mutex_unlock(&ep->guard);
 
         /* Control and bulk schedules need a kick to start working */
@@ -320 +327 @@
                 break;
         }
+
+        fibril_mutex_lock(&hc->guard);
+        list_append(&ohci_ep->pending_link, &hc->pending_endpoints);
         fibril_mutex_unlock(&hc->guard);
+
         return EOK;
 }
@@ -353 +364 @@
                     OHCI_RD(hc->registers->periodic_current));
 
-                link_t *current = list_first(&hc->pending_batches);
-                while (current && current != &hc->pending_batches.head) {
-                        link_t *next = current->next;
-                        ohci_transfer_batch_t *batch =
-                            ohci_transfer_batch_from_link(current);
+                list_foreach_safe(hc->pending_endpoints, current, next) {
+                        ohci_endpoint_t *ep
+                                = list_get_instance(current, ohci_endpoint_t, pending_link);
+
+                        fibril_mutex_lock(&ep->base.guard);
+                        ohci_transfer_batch_t *batch
+                                = ohci_transfer_batch_get(ep->base.active_batch);
+                        assert(batch);
 
                         if (ohci_transfer_batch_check_completed(batch)) {
+                                endpoint_deactivate_locked(&ep->base);
                                 list_remove(current);
+                                endpoint_del_ref(&ep->base);
                                 usb_transfer_batch_finish(&batch->base);
                         }
-
-                        current = next;
+                        fibril_mutex_unlock(&ep->base.guard);
                 }
                 fibril_mutex_unlock(&hc->guard);