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

Timestamp:

2011-05-30T11:40:58Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

b2387c2

Parents:

98e15b1 (diff), 3dfdcb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with usb/development

File:

• uspace/lib/usbhid/src/hiddescriptor.c (modified) (3 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);
@@ -216 +220 @@
                         }
                         else {
-                                usage = report_item->usages[
+                                usage = report_item->usages[
                                         report_item->usages_count- 1]; 
                         }
@@ -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) {
+                        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) {
                         field->offset += 8;
                         report->use_report_ids = 1;
                 }
+
                 field->item_flags = report_item->item_flags;