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

Timestamp:

2018-01-17T17:55:35Z (6 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/endpoint_list.c (modified) (5 diffs)

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

@@ -108 +108 @@
                 /* There are active EDs, get the last one */
                 ohci_endpoint_t *last = list_get_instance(
-                    list_last(&instance->endpoint_list), ohci_endpoint_t, link);
+                    list_last(&instance->endpoint_list), ohci_endpoint_t, eplist_link);
                 last_ed = last->ed;
         }
@@ -122 +122 @@
 
         /* Add to the sw list */
-        list_append(&ep->link, &instance->endpoint_list);
+        list_append(&ep->eplist_link, &instance->endpoint_list);
 
         ohci_endpoint_t *first = list_get_instance(
-            list_first(&instance->endpoint_list), ohci_endpoint_t, link);
+            list_first(&instance->endpoint_list), ohci_endpoint_t, eplist_link);
         usb_log_debug("HCD EP(%p) added to list %s, first is %p(%p).",
                 ep, instance->name, first, first->ed);
@@ -156 +156 @@
         ed_t *prev_ed;
         /* Remove from the hardware queue */
-        if (list_first(&instance->endpoint_list) == &ep->link) {
+        if (list_first(&instance->endpoint_list) == &ep->eplist_link) {
                 /* I'm the first one here */
                 prev_ed = instance->list_head;
@@ -162 +162 @@
         } else {
                 ohci_endpoint_t *prev =
-                    list_get_instance(ep->link.prev, ohci_endpoint_t, link);
+                    list_get_instance(ep->eplist_link.prev, ohci_endpoint_t, eplist_link);
                 prev_ed = prev->ed;
                 qpos = "NOT FIRST";
@@ -175 +175 @@
 
         /* Remove from the endpoint list */
-        list_remove(&ep->link);
+        list_remove(&ep->eplist_link);
         fibril_mutex_unlock(&instance->guard);
 }