Changeset 3b5d5b9d in mainline

Timestamp:

2011-05-06T08:50:42Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

166c4752, 22ded10

Parents:

acdbd780

Message:

#209 - correct usage paths for decomposed items, bug fix

Location:

uspace

Files:

• drv/usbhid/mouse/mousedev.c (modified) (1 diff)
• lib/usb/src/hiddescriptor.c (modified) (6 diffs)
• lib/usb/src/hidparser.c (modified) (1 diff)

uspace/drv/usbhid/mouse/mousedev.c

@@ -268 +268 @@
             USB_HID_REPORT_TYPE_INPUT);
 
-        if (field != NULL) {
+        while (field != NULL) {
                 usb_log_debug(NAME " VALUE(%X) USAGE(%X)\n", field->value, 
                     field->usage);

uspace/lib/usb/src/hiddescriptor.c

@@ -101 +101 @@
 }
 
+
+/*
+ *
+ *
+ */
 int usb_hid_report_append_fields(usb_hid_report_t *report, usb_hid_report_item_t *report_item)
 {
@@ -134 +139 @@
                 if(report_item->usages_count > 0 && ((report_item->usage_minimum == 0) && (report_item->usage_maximum == 0))) {
                         uint32_t usage;
-                        if(report_item->type != USB_HID_REPORT_TYPE_OUTPUT) {
-                                if(i < report_item->usages_count){
-                                        usage = report_item->usages[i];
-                                }
-                                else {
-                                        usage = report_item->usages[report_item->usages_count - 1];
-                                }
+                        if(i < report_item->usages_count){
+                                usage = report_item->usages[i];
                         }
                         else {
-                                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];
-                                }
+                                usage = report_item->usages[report_item->usages_count - 1];
                         }
 
@@ -164 +159 @@
 
                 if((USB_HID_ITEM_FLAG_VARIABLE(report_item->item_flags) != 0) && (!((report_item->usage_minimum == 0) && (report_item->usage_maximum == 0)))) {
-                        if(report_item->type == USB_HID_REPORT_TYPE_INPUT) {
-                                field->usage = report_item->usage_maximum - i;
-                        }
-                        else {
-                                field->usage = report_item->usage_minimum + i;                                  
-                        }
-
+                        field->usage = report_item->usage_minimum + i;                                  
                 }
                 
@@ -179 +168 @@
 
                 field->size = report_item->size;
-                field->offset = report_item->offset + (i * report_item->size);
+                
+                size_t offset_byte = (report_item->offset + (i * report_item->size)) / 8;
+                size_t offset_bit = 8 - ((report_item->offset + (i * report_item->size)) % 8) - report_item->size;
+
+                field->offset = 8 * offset_byte + offset_bit;
                 if(report_item->id != 0) {
                         field->offset += 8;
@@ -640 +633 @@
 
                 usb_log_debug("\t\tOFFSET: %X\n", report_item->offset);
-                usb_log_debug("\t\tSIZE: %zu\n", report_item->size);
+                usb_log_debug("\t\tSIZE: %X\n", report_item->size);                             
                 usb_log_debug("\t\tLOGMIN: %d\n", report_item->logical_minimum);
                 usb_log_debug("\t\tLOGMAX: %d\n", report_item->logical_maximum);                
@@ -679 +672 @@
                 usb_log_debug("Report ID: %d\n", report_des->report_id);
                 usb_log_debug("\tType: %d\n", report_des->type);
-                usb_log_debug("\tLength: %zu\n", report_des->bit_length);
-                usb_log_debug("\tItems: %zu\n", report_des->item_length);
+                usb_log_debug("\tLength: %d\n", report_des->bit_length);                
+                usb_log_debug("\tItems: %d\n", report_des->item_length);                
 
                 usb_hid_descriptor_print_list(&report_des->report_items);

uspace/lib/usb/src/hidparser.c

@@ -405 +405 @@
                                 }
 
-                                size_t shift = offset%8;
+                                size_t shift = 8 - offset%8 - length;
 
                                 value = value << shift;