Changeset 3f03199 in mainline for uspace/drv/bus/usb/usbmid

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.

Location:

uspace/drv/bus/usb/usbmid

Files:

• explore.c (modified) (1 diff)
• usbmid.c (modified) (1 diff)

uspace/drv/bus/usb/usbmid/explore.c

@@ -50 +50 @@
 static bool interface_in_list(const list_t *list, int interface_no)
 {
-        list_foreach(*list, l) {
-                const usbmid_interface_t *iface = usbmid_interface_from_link(l);
+        list_foreach(*list, link, const usbmid_interface_t, iface) {
                 if (iface->interface_no == interface_no) {
                         return true;

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -140 +140 @@
         }
 
-        list_foreach(match_ids.ids, link) {
-                match_id_t *match_id = list_get_instance(link, match_id_t, link);
+        list_foreach(match_ids.ids, link, match_id_t, match_id) {
                 rc = ddf_fun_add_match_id(child, match_id->id, match_id->score);
                 if (rc != EOK) {