Changeset 574f276 in mainline for uspace/lib/usbhid/src/hiddescriptor.c

Timestamp:

2011-05-27T17:37:21Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

4967c1e

Parents:

0c904a3

Message:

parsing of customer controls bug fixed

File:

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

uspace/lib/usbhid/src/hiddescriptor.c

@@ -187 +187 @@
 
                 field = malloc(sizeof(usb_hid_report_field_t));
+                if(field == NULL) {
+                        return ENOMEM;
+                }
+
                 memset(field, 0, sizeof(usb_hid_report_field_t));
                 list_initialize(&field->link);
@@ -241 +245 @@
 
                 field->size = 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) {
+        
+                if(report_item->type == USB_HID_REPORT_TYPE_INPUT) {
+                        field->offset = report_item->offset + 
+                            ((report_item->count - (i + 1)) * 
+                            report_item->size);
+                }
+                else {
+                        field->offset = report_item->offset + (i * report_item->size);
+                }
+
+                if(report->use_report_ids != 0) {
                         field->offset += 8;
                         report->use_report_ids = 1;