Changes in uspace/lib/usbhid/src/hidparser.c [feeac0d:1e371cf] in mainline

File:

• uspace/lib/usbhid/src/hidparser.c (modified) (12 diffs)

uspace/lib/usbhid/src/hidparser.c

@@ -132 +132 @@
         usb_hid_report_description_t *report_des;
         usb_hid_report_type_t type = USB_HID_REPORT_TYPE_INPUT;
-
+        
         if (report == NULL) {
                 return EINVAL;
@@ -155 +155 @@
 
                 if (USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) == 0) {
-
+                        
                         if (USB_HID_ITEM_FLAG_VARIABLE(item->item_flags) == 0) {
                                 /* array */
                                 item->value = 
                                         usb_hid_translate_data(item, data);
-
+                                
                                 item->usage = USB_HID_EXTENDED_USAGE(
                                     item->usages[item->value -
@@ -185 +185 @@
                 }
         }
-
+        
         return EOK;
 }
@@ -293 +293 @@
 
         list_foreach(report->reports, reports_link,
-            usb_hid_report_description_t, report_des) {
-                if ((report_des->report_id == report_id) &&
-                    (report_des->type == USB_HID_REPORT_TYPE_OUTPUT)) {
+            usb_hid_report_description_t, rdes) {
+                if ((rdes->report_id == report_id) &&
+                    (rdes->type == USB_HID_REPORT_TYPE_OUTPUT)) {
+                        report_des = rdes;
                         break;
                 }
@@ -340 +341 @@
         int length;
         int32_t tmp_value;
-
+        
         if (report == NULL) {
                 return EINVAL;
@@ -352 +353 @@
         report_des = usb_hid_report_find_description(report, report_id, 
             USB_HID_REPORT_TYPE_OUTPUT);
-
+        
         if (report_des == NULL) {
                 return EINVAL;
@@ -364 +365 @@
                 offset = report_des->bit_length - report_item->offset - 1;
                 length = report_item->size;
-
+                
                 usb_log_debug("\ttranslated value: %x\n", value);
 
@@ -375 +376 @@
                         value = value << shift;
                         value = value & (((1 << length) - 1) << shift);
-
+                        
                         uint8_t mask = 0;
                         mask = 0xff - (((1 << length) - 1) << shift);
@@ -391 +392 @@
 
                                         tmp_value = tmp_value << (offset % 8);
-
+                                        
                                         mask = ~(((1 << (8 - (offset % 8))) - 1)
                                             << (offset % 8));
@@ -398 +399 @@
                                             tmp_value;
                                 } else if (i == ((offset + length - 1) / 8)) {
-
+                                        
                                         value = value >> (length - 
                                             ((offset + length) % 8));
@@ -404 +405 @@
                                         value = value & ((1 << (length - 
                                             ((offset + length) % 8))) - 1);
-
+                                        
                                         mask = (1 << (length - 
                                             ((offset + length) % 8))) - 1;
@@ -418 +419 @@
                 report_item->value = 0;
         }
-
+        
         return EOK;
 }