Changeset 2020927 in mainline

Timestamp:

2011-04-21T21:35:33Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

1553cbf

Parents:

c7c0984a

Message:

HID parser should better support Usages in Reports fixed

File:

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

uspace/lib/usb/src/hidparser.c

@@ -73 +73 @@
 void usb_hid_print_usage_path(usb_hid_report_path_t *path);
 void usb_hid_descriptor_print_list(link_t *head);
-int usb_hid_report_reset_local_items();
+void usb_hid_report_reset_local_items(usb_hid_report_item_t *report_item);
 void usb_hid_free_report_list(link_t *head);
 usb_hid_report_item_t *usb_hid_report_item_clone(const usb_hid_report_item_t *item);
@@ -144 +144 @@
         }
 
+        for(i=0; i<report_item->usages_count; i++){
+                usb_log_debug("usages (%d) - %x\n", i, report_item->usages[i]);
+        }
+
         
         for(i=0; i<report_item->count; i++){
@@ -168 +172 @@
 
                 if(report_item->usages_count > 0 && ((report_item->usage_minimum == 0) && (report_item->usage_maximum == 0))) {
-                        if(i < report_item->usages_count){
-                                if((report_item->usages[i] & 0xFF00) != 0){
-                                        field->usage_page = (report_item->usages[i] >> 16);                                     
-                                        field->usage = (report_item->usages[i] & 0xFF);
+                        uint32_t usage;
+                        if(report_item->type == USB_HID_REPORT_TYPE_INPUT) {
+                                if(i < report_item->usages_count){
+                                        usage = report_item->usages[i];
                                 }
                                 else {
-                                        field->usage = report_item->usages[i];
+                                        usage = report_item->usages[report_item->usages_count - 1];
                                 }
                         }
                         else {
-                                field->usage = report_item->usages[report_item->usages_count - 1];
-                        }
+                                if((report_item->count - i - 1) < report_item->usages_count){
+                                        usage = report_item->usages[(report_item->count - i - 1)];
+                                }
+                                else {
+                                        usage = report_item->usages[report_item->usages_count - 1];
+                                }
+                        }
+
+                                                
+                        if((usage & 0xFF00) != 0){
+                                field->usage_page = (usage >> 16);                                      
+                                field->usage = (usage & 0xFF);
+                        }
+                        else {
+                                field->usage = usage;
+                        }
+
+                        
                 }       
 
@@ -342 +362 @@
 
                                         /* reset local items */
-                                        while(report_item->usages_count > 0){
-                                                report_item->usages[--(report_item->usages_count)] = 0;
-                                        }
-
-                                        report_item->extended_usage_page = 0;
-                                        report_item->usage_minimum = 0;
-                                        report_item->usage_maximum = 0;
-                                        report_item->designator_index = 0;
-                                        report_item->designator_minimum = 0;
-                                        report_item->designator_maximum = 0;
-                                        report_item->string_index = 0;
-                                        report_item->string_minimum = 0;
-                                        report_item->string_maximum = 0;
+                                        usb_hid_report_reset_local_items (report_item);
 
                                         break;
@@ -476 +484 @@
                         // TODO usage_path->flags = *data;
                         usb_hid_report_path_append_item(usage_path, report_item->usage_page, report_item->usages[report_item->usages_count-1]);                                         
+                        usb_hid_report_reset_local_items (report_item);
                         return USB_HID_NO_ACTION;
                         break;
@@ -567 +576 @@
         {
                 case USB_HID_REPORT_TAG_USAGE:
-                        report_item->usages[report_item->usages_count++] = usb_hid_report_tag_data_int32(data,item_size);
+                        report_item->usages[report_item->usages_count] = usb_hid_report_tag_data_int32(data,item_size);
+                        report_item->usages_count++;
                         break;
                 case USB_HID_REPORT_TAG_USAGE_MINIMUM:
@@ -1683 +1693 @@
 }
 
-
+void usb_hid_report_reset_local_items(usb_hid_report_item_t *report_item)
+{
+        if(report_item == NULL) {
+                return;
+        }
+        
+        report_item->usages_count = 0;
+        memset(report_item->usages, 0, USB_HID_MAX_USAGES);
+        
+        report_item->extended_usage_page = 0;
+        report_item->usage_minimum = 0;
+        report_item->usage_maximum = 0;
+        report_item->designator_index = 0;
+        report_item->designator_minimum = 0;
+        report_item->designator_maximum = 0;
+        report_item->string_index = 0;
+        report_item->string_minimum = 0;
+        report_item->string_maximum = 0;
+
+        return;
+}
 /**
  * @}