Changeset 68b614e in mainline for uspace/lib/usb/src/hiddescriptor.c

Timestamp:

2011-05-08T16:00:58Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

f50f722

Parents:

cc5908e

Message:

Correct parsing of usages in case of array items

File:

• uspace/lib/usb/src/hiddescriptor.c (modified) (12 diffs)

uspace/lib/usb/src/hiddescriptor.c

@@ -64 +64 @@
 {
         /* find or append current collection path to the list */
-        link_t *path_it = report->collection_paths.next;
+        //link_t *path_it = report->collection_paths.next;
+        link_t *path_it = report->collection_paths.prev->next;
         usb_hid_report_path_t *path = NULL;
+        
+        
         while(path_it != &report->collection_paths) {
                 path = list_get_instance(path_it, usb_hid_report_path_t, link);
@@ -115 +118 @@
         usb_hid_report_field_t *field;
         int i;
-
-        usb_log_debug("usages_count  - %zu\n", report_item->usages_count);
 
         uint32_t *usages;
@@ -147 +148 @@
                         */
                         field->usage = 0;
-                        field->usage_page = report_item->usage_page;
+                        field->usage_page = 0; //report_item->usage_page;
 
                         field->usages_count = report_item->usages_count;
@@ -168 +169 @@
                         }
                         else {
+                                // should not occur
                                 field->usage = usage;
                                 field->usage_page = report_item->usage_page;
@@ -465 +467 @@
                         
                         // set last item
-                        usb_hid_report_set_last_item(usage_path, USB_HID_TAG_CLASS_GLOBAL, report_item->usage_page);
-                        usb_hid_report_set_last_item(usage_path, USB_HID_TAG_CLASS_LOCAL, report_item->usages[report_item->usages_count-1]);
+                        usb_hid_report_set_last_item(usage_path, 
+                                                     USB_HID_TAG_CLASS_GLOBAL, 
+                                                     USB_HID_EXTENDED_USAGE_PAGE(report_item->usages[report_item->usages_count-1]));
+                        usb_hid_report_set_last_item(usage_path, 
+                                                     USB_HID_TAG_CLASS_LOCAL, 
+                                                     USB_HID_EXTENDED_USAGE(report_item->usages[report_item->usages_count-1]));
                         
                         // append the new one which will be set by common
@@ -561 +567 @@
                              usb_hid_report_item_t *report_item, usb_hid_report_path_t *usage_path)
 {
+        int32_t extended_usage;
+        
         switch(tag) {
                 case USB_HID_REPORT_TAG_USAGE:
@@ -570 +578 @@
                                         report_item->in_delimiter = INSIDE_DELIMITER_SET;
                                 case OUTSIDE_DELIMITER_SET:
-                                        report_item->usages[report_item->usages_count] = usb_hid_report_tag_data_uint32(data,item_size);
+                                        extended_usage = ((report_item->usage_page) << 16);
+                                        extended_usage += usb_hid_report_tag_data_uint32(data,item_size);
+                                        report_item->usages[report_item->usages_count] = extended_usage;
                                         report_item->usages_count++;
                                         break;
@@ -607 +617 @@
                                 }
                                 else {
-                                        report_item->usages[report_item->usages_count++] = i;
+                                        
+                                        report_item->usages[report_item->usages_count++] = (report_item->usage_page << 16) + i;
                                 }
                         }
@@ -691 +702 @@
                 usb_log_debug("\t\ttUSAGEMIN: %X\n", report_item->usage_minimum);
                 usb_log_debug("\t\tUSAGEMAX: %X\n", report_item->usage_maximum);
+                usb_log_debug("\t\tUSAGES COUNT: %zu\n", report_item->usages_count);
 
                 usb_log_debug("\t\tVALUE: %X\n", report_item->value);
@@ -696 +708 @@
                 usb_log_debug("\t\tUSAGE PAGE: %X\n", report_item->usage_page);
                 
-                //usb_hid_print_usage_path(report_item->collection_path);
+                usb_hid_print_usage_path(report_item->collection_path);
 
                 usb_log_debug("\n");            
@@ -728 +740 @@
                 usb_hid_descriptor_print_list(&report_des->report_items);
 
-
+/*
                 link_t *path_it = report->collection_paths.next;
                 while(path_it != &report->collection_paths) {
@@ -734 +746 @@
                         path_it = path_it->next;
                 }
-                
+*/              
                 report_it = report_it->next;
         }