Changeset 0773396 in mainline for uspace/lib/usbhid/src/hidparser.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/hidparser.c (modified) (10 diffs)

uspace/lib/usbhid/src/hidparser.c

@@ -130 +130 @@
     size_t size, uint8_t *report_id)
 {
-        usb_hid_report_field_t *item;
-
         usb_hid_report_description_t *report_des;
         usb_hid_report_type_t type = USB_HID_REPORT_TYPE_INPUT;
@@ -153 +151 @@
 
         /* read data */
-        list_foreach(report_des->report_items, list_item) {
-                item = list_get_instance(list_item, usb_hid_report_field_t, 
-                    ritems_link);
+        list_foreach(report_des->report_items, ritems_link,
+            usb_hid_report_field_t, item) {
 
                 if (USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) == 0) {
@@ -163 +160 @@
                                 item->value = 
                                         usb_hid_translate_data(item, data);
-                
+                                
                                 item->usage = USB_HID_EXTENDED_USAGE(
                                     item->usages[item->value -
@@ -184 +181 @@
                                 /* variable item */
                                 item->value = usb_hid_translate_data(item, 
-                                    data);                              
-                        }                       
+                                    data);
+                        }
                 }
         }
@@ -295 +292 @@
         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);
-                
-                if ((report_des->report_id == report_id) &&
-                    (report_des->type == USB_HID_REPORT_TYPE_OUTPUT)) {
+        list_foreach(report->reports, reports_link,
+            usb_hid_report_description_t, rdes) {
+                if ((rdes->report_id == report_id) &&
+                    (rdes->type == USB_HID_REPORT_TYPE_OUTPUT)) {
+                        report_des = rdes;
                         break;
                 }
@@ -351 +347 @@
 
         if (report->use_report_ids != 0) {
-                buffer[0] = report_id;          
+                buffer[0] = report_id;
         }
 
@@ -362 +358 @@
         }
 
-        usb_hid_report_field_t *report_item;
-
-        list_foreach(report_des->report_items, item) {
-                report_item = list_get_instance(item, usb_hid_report_field_t,
-                    ritems_link);
-
+        list_foreach(report_des->report_items, ritems_link,
+            usb_hid_report_field_t, report_item) {
                 value = usb_hid_translate_data_reverse(report_item, 
                     report_item->value);
@@ -382 +374 @@
                         }
                         size_t shift = 8 - offset % 8 - length;
-                        value = value << shift;                                                 
+                        value = value << shift;
                         value = value & (((1 << length) - 1) << shift);
-                                
+                        
                         uint8_t mask = 0;
                         mask = 0xff - (((1 << length) - 1) << shift);
@@ -400 +392 @@
 
                                         tmp_value = tmp_value << (offset % 8);
-        
+                                        
                                         mask = ~(((1 << (8 - (offset % 8))) - 1)
                                             << (offset % 8));
@@ -413 +405 @@
                                         value = value & ((1 << (length - 
                                             ((offset + length) % 8))) - 1);
-                                
+                                        
                                         mask = (1 << (length - 
                                             ((offset + length) % 8))) - 1;