Changeset 8242dd86 in mainline

Timestamp:

2011-05-27T09:53:49Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

e56b8a3

Parents:

1432fcf3

Message:

report parsing bug fix - multibyte items

File:

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

uspace/lib/usbhid/src/hidparser.c

@@ -153 +153 @@
 
 
-        report_des = usb_hid_report_find_description(report, *report_id, type);
+        report_des = usb_hid_report_find_description(report, *report_id, 
+                type);
+
         if(report_des == NULL) {
                 return EINVAL;
@@ -167 +169 @@
                 if(USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) == 0) {
                         
-                        if(USB_HID_ITEM_FLAG_VARIABLE(item->item_flags) == 0) {
+                        if(USB_HID_ITEM_FLAG_VARIABLE(item->item_flags) == 0){
 
                                 // array
@@ -174 +176 @@
                 
                                 item->usage = USB_HID_EXTENDED_USAGE(
-                                    item->usages[item->value - item->physical_minimum]);
-
-                                item->usage_page = USB_HID_EXTENDED_USAGE_PAGE(
-                                    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_report_set_last_item (item->collection_path, 
+                                    item->usages[
+                                    item->value - item->physical_minimum]);
+
+                                item->usage_page = 
+                                    USB_HID_EXTENDED_USAGE_PAGE(
+                                    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_report_set_last_item (
+                                    item->collection_path, 
                                     USB_HID_TAG_CLASS_LOCAL, item->usage);
                                 
@@ -188 +196 @@
                         else {
                                 // variable item
-                                item->value = usb_hid_translate_data(item, data);                               
+                                item->value = usb_hid_translate_data(item, 
+                                    data);                              
                         }                               
                 }
@@ -213 +222 @@
         
         int32_t value=0;
-        int32_t mask;
-        const uint8_t *foo;
+        int32_t mask=0;
+        const uint8_t *foo=0;
 
         // now only shot tags are allowed
@@ -240 +249 @@
         if((size_t)(offset/8) != (size_t)((offset+item->size-1)/8)) {
                 
-                part_size = ((offset+item->size)%8);
+                part_size = 0;
 
                 size_t i=0;
@@ -246 +255 @@
                         if(i == (size_t)(offset/8)) {
                                 // the higher one
+                                part_size = 8 - (offset % 8);
                                 foo = data + i;
                                 mask =  ((1 << (item->size-part_size))-1);
@@ -259 +269 @@
                                 value = value << 8;
                                 value += *(data + 1);
+                                part_size += 8;
                         }
                 }