Changeset 6283cefb in mainline for uspace/lib/usbhid/src/hiddescriptor.c

Timestamp:

2017-11-21T18:13:28Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

ae303ad

Parents:

6d91888

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-21 18:13:26)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-21 18:13:28)

Message:

usbhid: rewrite the way values are extracted

There was a bug, and I'm not able to find it. After the rewrite, it is
working as expected.

File:

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

uspace/lib/usbhid/src/hiddescriptor.c

@@ -246 +246 @@
                 field->size = report_item->size;
 
-                if(report_item->type == USB_HID_REPORT_TYPE_INPUT) {
-                        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);
-                }
-
+                field->offset = report_item->offset + (i * report_item->size);
 
                 if(report->use_report_ids != 0) {
@@ -901 +887 @@
         list_foreach(*list, ritems_link, usb_hid_report_field_t,
             report_item) {
-                usb_log_debug("\t\tOFFSET: %X\n", report_item->offset);
+                usb_log_debug("\t\tOFFSET: %u\n", report_item->offset);
                 usb_log_debug("\t\tSIZE: %zu\n", report_item->size);
                 usb_log_debug("\t\tLOGMIN: %d\n",