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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

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

    rdd7078c r3f03199  
    140140        }
    141141
    142         list_foreach(match_ids.ids, link) {
    143                 match_id_t *match_id = list_get_instance(link, match_id_t, link);
     142        list_foreach(match_ids.ids, link, match_id_t, match_id) {
    144143                rc = ddf_fun_add_match_id(child, match_id->id, match_id->score);
    145144                if (rc != EOK) {
Note: See TracChangeset for help on using the changeset viewer.