Changes in uspace/lib/usbhid/src/hidparser.c [d861c22:14e1bcc] in mainline

File:

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

uspace/lib/usbhid/src/hidparser.c

@@ -119 +119 @@
         }
         else {
-                return ((report_des->bit_length + 7) / 8) ;
+                if(report_id == 0) {                    
+                        return ((report_des->bit_length + 7) / 8) ;
+                }
+                else {
+                        return 1 + ((report_des->bit_length + 7) / 8);
+                }
         }
 }
@@ -162 +167 @@
         while(list_item != &(report_des->report_items)) {
 
-                item = list_get_instance(list_item, usb_hid_report_field_t, 
-                                link);
+                item = list_get_instance(list_item, usb_hid_report_field_t, link);
 
                 if(USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) == 0) {
@@ -170 +174 @@
 
                                 // array
-                                item->value = 
-                                        usb_hid_translate_data(item, data);
+                                item->value = usb_hid_translate_data(item, data);
                 
                                 item->usage = USB_HID_EXTENDED_USAGE(
-                                    item->usages[item->value - item->physical_minimum]);
-
+                                        item->usages[item->value - item->physical_minimum]);
                                 item->usage_page = USB_HID_EXTENDED_USAGE_PAGE(
-                                    item->usages[item->value - item->physical_minimum]);
+                                        item->usages[item->value - item->physical_minimum]);                            
 
                                 usb_hid_report_set_last_item (item->collection_path, 
-                                    USB_HID_TAG_CLASS_GLOBAL, item->usage_page);
-
+                                        USB_HID_TAG_CLASS_GLOBAL, item->usage_page);
                                 usb_hid_report_set_last_item (item->collection_path, 
                                     USB_HID_TAG_CLASS_LOCAL, item->usage);
@@ -272 +273 @@
         }
 
-        return (int)(((value - item->logical_minimum) / resolution) + 
-                item->physical_minimum);
+        return (int)(((value - item->logical_minimum) / resolution) + item->physical_minimum);
         
 }
@@ -415 +415 @@
                                 if(i == (offset/8)) {
                                         tmp_value = value;
-                                        tmp_value = tmp_value & 
-                                                ((1 << (8-(offset%8)))-1);
-
+                                        tmp_value = tmp_value & ((1 << (8-(offset%8)))-1);                              
                                         tmp_value = tmp_value << (offset%8);
         
-                                        mask = ~(((1 << (8-(offset%8)))-1) << 
-                                                        (offset%8));
-
-                                        buffer[i] = (buffer[i] & mask) | 
-                                                tmp_value;
+                                        mask = ~(((1 << (8-(offset%8)))-1) << (offset%8));
+                                        buffer[i] = (buffer[i] & mask) | tmp_value;                     
                                 }
                                 else if (i == ((offset + length -1)/8)) {
                                         
-                                        value = value >> (length - 
-                                                ((offset + length) % 8));
-
-                                        value = value & ((1 << (length - 
-                                                ((offset + length) % 8))) - 1);
+                                        value = value >> (length - ((offset + length) % 8));
+                                        value = value & 
+                                                ((1 << (length - ((offset + length) % 8))) - 1);
                                 
-                                        mask = (1 << (length - 
-                                                ((offset + length) % 8))) - 1;
-
+                                        mask = (1 << (length - ((offset + length) % 8))) - 1;
                                         buffer[i] = (buffer[i] & mask) | value;
                                 }
@@ -538 +529 @@
         usb_hid_report_type_t type)
 {
-        usb_hid_report_description_t *report_des = 
-                usb_hid_report_find_description(report, path->report_id, type);
+        usb_hid_report_description_t *report_des = usb_hid_report_find_description(
+                report, path->report_id, type);
 
         link_t *field_it;
@@ -555 +546 @@
 
         while(field_it != &report_des->report_items) {
-                field = list_get_instance(field_it, usb_hid_report_field_t, 
-                        link);
+                field = list_get_instance(field_it, usb_hid_report_field_t, link);
 
                 if(USB_HID_ITEM_FLAG_CONSTANT(field->item_flags) == 0) {
-                        usb_hid_report_path_append_item (
-                                field->collection_path, field->usage_page, 
-                                field->usage);
-
-                        if(usb_hid_report_compare_usage_path(
-                                field->collection_path, path, flags) == EOK){
-
-                                usb_hid_report_remove_last_item(
-                                        field->collection_path);
-
+                        usb_hid_report_path_append_item (field->collection_path, 
+                                field->usage_page, field->usage);
+
+                        if(usb_hid_report_compare_usage_path(field->collection_path, path, 
+                                flags) == EOK){
+
+                                usb_hid_report_remove_last_item(field->collection_path);
                                 return field;
                         }
-                        usb_hid_report_remove_last_item (
-                                field->collection_path);
+                        usb_hid_report_remove_last_item (field->collection_path);
                 }
                 field_it = field_it->next;