Changeset 252cf2a in mainline for uspace/lib/usb/src/hidparser.c

Timestamp:

2011-05-08T15:53:44Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

f55ded3

Parents:

cc5908e

Message:

Development changes merge
Correct parsing of usages in case of array items

File:

• uspace/lib/usb/src/hidparser.c (modified) (3 diffs)

uspace/lib/usb/src/hidparser.c

@@ -111 +111 @@
         usb_hid_report_description_t *report_des;
         usb_hid_report_type_t type = USB_HID_REPORT_TYPE_INPUT;
-
+        
         if(report == NULL) {
                 return EINVAL;
@@ -140 +140 @@
                 
                                 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]);
-
+                                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);
+                                
                         }
                         else {
@@ -150 +157 @@
                 list_item = list_item->next;
         }
-           
+        
         return EOK;