Changeset c7c0984a in mainline

Timestamp:

2011-04-21T20:47:24Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

2020927, eb393ad

Parents:

cfbbe1d3

Message:

Report IDs are not stored in Usage paths in the report structure fix

File:

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

uspace/lib/usb/src/hidparser.c

@@ -362 +362 @@
                                         offset_output = 0;
                                         offset_feature = 0;
+                                        usb_hid_report_path_set_report_id (usage_path, report_item->id);
                                         break;
 
@@ -1250 +1251 @@
                 return NULL;
         }
+
+        new_usage_path->report_id = usage_path->report_id;
         
         if(list_empty(&usage_path->head)){
@@ -1639 +1642 @@
         while(field_it != &report_des->report_items) {
                 field = list_get_instance(field_it, usb_hid_report_field_t, link);
-                        
-                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){
+
+                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);
+                                return field;
+                        }
                         usb_hid_report_remove_last_item (field->collection_path);
-                        return field;
-                }
-                usb_hid_report_remove_last_item (field->collection_path);
-
+                }
                 field_it = field_it->next;
         }