Changeset ee7e7c93 in mainline

Timestamp:

2011-05-30T10:42:05Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

3dfdcb7, dcb7d7cd

Parents:

4967c1e

Message:

Bug fixes in report description construction

File:

• uspace/lib/usbhid/src/hiddescriptor.c (modified) (3 diffs)

uspace/lib/usbhid/src/hiddescriptor.c

@@ -220 +220 @@
                         }
                         else {
-                                usage = report_item->usages[
+                                usage = report_item->usages[
                                         report_item->usages_count- 1]; 
                         }
@@ -245 +245 @@
 
                 field->size = report_item->size;
-        
+
                 if(report_item->type == USB_HID_REPORT_TYPE_INPUT) {
-                        field->offset = report_item->offset + 
-                            ((report_item->count - (i + 1)) * 
-                            report_item->size);
+                        int offset = report_item->offset + report_item->size * i;
+                        int field_offset = (offset/8)*8 + (offset/8 + 1) * 8 - 
+                                offset - report_item->size;
+                        if(field_offset < 0) {
+                                field->offset = 0;
+                        }
+                        else {
+                                field->offset = field_offset;
+                        }
                 }
                 else {
                         field->offset = report_item->offset + (i * report_item->size);
                 }
+
 
                 if(report->use_report_ids != 0) {
@@ -259 +266 @@
                         report->use_report_ids = 1;
                 }
+
                 field->item_flags = report_item->item_flags;