Changeset 3f03199 in mainline for uspace/lib/usbhost/src/ddf_helpers.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (2 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -335 +335 @@
 
         ddf_fun_set_ops(fun, &usb_ops);
-        list_foreach(mids->ids, iter) {
-                match_id_t *mid = list_get_instance(iter, match_id_t, link);
+        list_foreach(mids->ids, link, const match_id_t, mid) {
                 ddf_fun_add_match_id(fun, mid->id, mid->score);
         }
@@ -422 +421 @@
         usb_dev_t *victim = NULL;
 
-        list_foreach(hub->devices, it) {
-                victim = list_get_instance(it, usb_dev_t, link);
-                if (victim->port == port)
+        list_foreach(hub->devices, link, usb_dev_t, it) {
+                if (it->port == port) {
+                        victim = it;
                         break;
+                }
         }
         if (victim && victim->port == port) {