Changeset 0c2d9bb in mainline for uspace/lib/usbhid/src/hiddescriptor.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/lib/usbhid/src/hiddescriptor.c (modified) (5 diffs)

uspace/lib/usbhid/src/hiddescriptor.c

@@ -333 +333 @@
         }
 
-        usb_hid_report_description_t *report_des = NULL;
-        
-        list_foreach(report->reports, report_it) {
-                report_des = list_get_instance(report_it,
-                                usb_hid_report_description_t, reports_link);
-
+        list_foreach(report->reports, reports_link,
+            usb_hid_report_description_t, report_des) {
                 // if report id not set, return the first of the type
                 if(((report_des->report_id == report_id) || (report_id == 0)) && 
@@ -902 +898 @@
 void usb_hid_descriptor_print_list(list_t *list)
 {
-        usb_hid_report_field_t *report_item;
-
         if(list == NULL || list_empty(list)) {
             usb_log_debug("\tempty\n");
@@ -909 +903 @@
         }
 
-        list_foreach(*list, item) {
-                report_item = list_get_instance(item, usb_hid_report_field_t,
-                                ritems_link);
-
+        list_foreach(*list, ritems_link, usb_hid_report_field_t,
+            report_item) {
                 usb_log_debug("\t\tOFFSET: %X\n", report_item->offset);
                 usb_log_debug("\t\tSIZE: %zu\n", report_item->size);
@@ -937 +929 @@
 
                 usb_log_debug("\n");
-
-        }
-
+        }
 }
 
@@ -951 +941 @@
 void usb_hid_descriptor_print(usb_hid_report_t *report)
 {
-        if(report == NULL) {
+        if (report == NULL)
                 return;
-        }
-
-        usb_hid_report_description_t *report_des;
-
-        list_foreach(report->reports, report_it) {
-                report_des = list_get_instance(report_it,
-                        usb_hid_report_description_t, reports_link);
+
+        list_foreach(report->reports, reports_link,
+            usb_hid_report_description_t, report_des) {
                 usb_log_debug("Report ID: %d\n", report_des->report_id);
                 usb_log_debug("\tType: %d\n", report_des->type);