Changeset 33382a9 in mainline

Timestamp:

2011-03-11T16:56:00Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

c32688d

Parents:

0bd4810c

Message:

#128 - skip constant items in report

File:

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

uspace/lib/usb/src/hidparser.c

@@ -607 +607 @@
 
         // get the size of result keycodes array
-        list_item = parser->input.next;    
-        while(list_item != &(parser->input)) {
-
-                item = list_get_instance(list_item, usb_hid_report_item_t, link);
-                if(item->usage_page == BAD_HACK_USAGE_PAGE) {
-                        key_count += item->count;
-                }
-
-                list_item = list_item->next;
-        }
-
-        
+        usb_hid_report_path_t path;
+        path.usage_page = BAD_HACK_USAGE_PAGE;
+        key_count = usb_hid_report_input_length(parser, &path);
+
         if(!(keys = malloc(sizeof(uint8_t) * key_count))){
                 return ENOMEM;
@@ -628 +620 @@
 
                 item = list_get_instance(list_item, usb_hid_report_item_t, link);
-                if(item->usage_page == BAD_HACK_USAGE_PAGE) {
+                if(!USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) &&
+                   (item->usage_page == BAD_HACK_USAGE_PAGE)) {
                         for(j=0; j<(size_t)(item->count); j++) {
                                 keys[i++] = usb_hid_translate_data(item, data,j);
@@ -730 +723 @@
         while(&parser->input != item) {
                 report_item = list_get_instance(item, usb_hid_report_item_t, link);
-                if(report_item->usage_page == path->usage_page) {
+                if(!USB_HID_ITEM_FLAG_CONSTANT(report_item->item_flags) &&
+                   (report_item->usage_page == path->usage_page)) {
                         ret += report_item->count;
                 }