Changeset 3842a955 in mainline for uspace/drv/ohci/endpoint_list.c

Timestamp:

2011-06-19T15:59:42Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

26e7d6d

Parents:

9724d7f (diff), 74464e8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/drv/ohci/endpoint_list.c (modified) (3 diffs)

uspace/drv/ohci/endpoint_list.c

@@ -103 +103 @@
                 /* There are active EDs, get the last one */
                 hcd_endpoint_t *last = list_get_instance(
-                    instance->endpoint_list.prev, hcd_endpoint_t, link);
-                assert(last);
+                    list_last(&instance->endpoint_list), hcd_endpoint_t, link);
                 last_ed = last->ed;
         }
@@ -121 +120 @@
 
         hcd_endpoint_t *first = list_get_instance(
-            instance->endpoint_list.next, hcd_endpoint_t, link);
+            list_first(&instance->endpoint_list), hcd_endpoint_t, link);
         usb_log_debug("HCD EP(%p) added to list %s, first is %p(%p).\n",
                 hcd_ep, instance->name, first, first->ed);
@@ -153 +152 @@
         ed_t *prev_ed;
         /* Remove from the hardware queue */
-        if (instance->endpoint_list.next == &hcd_ep->link) {
+        if (list_first(&instance->endpoint_list) == &hcd_ep->link) {
                 /* I'm the first one here */
                 prev_ed = instance->list_head;