Changeset 3f03199 in mainline for uspace/app/usbinfo

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/app/usbinfo

Files:

• dump.c (modified) (1 diff)
• hid.c (modified) (1 diff)

uspace/app/usbinfo/dump.c

@@ -103 +103 @@
 void dump_match_ids(match_id_list_t *matches, const char *line_prefix)
 {
-        list_foreach(matches->ids, link) {
-                match_id_t *match = list_get_instance(link, match_id_t, link);
-
+        list_foreach(matches->ids, link, match_id_t, match) {
                 printf("%s%3d %s\n", line_prefix, match->score, match->id);
         }

uspace/app/usbinfo/hid.c

@@ -101 +101 @@
         printf("%sParsed HID report descriptor for interface %d\n",
             get_indent(0), iface_no);
-        list_foreach(report->reports, report_it) {
-                usb_hid_report_description_t *description = list_get_instance(
-                    report_it, usb_hid_report_description_t, reports_link);
+        list_foreach(report->reports, reports_link,
+            usb_hid_report_description_t, description) {
                 printf("%sReport %d (type %d)\n", get_indent(1),
                     (int) description->report_id,
                     (int) description->type);
-                list_foreach(description->report_items, item_it) {
-                        usb_hid_report_field_t *field = list_get_instance(
-                            item_it, usb_hid_report_field_t, ritems_link);
+                list_foreach(description->report_items, ritems_link,
+                    usb_hid_report_field_t, field) {
                         printf("%sUsage page = 0x%04x    Usage = 0x%04x\n",
                             get_indent(2),