Changes in uspace/lib/usbhid/src/hiddescriptor.c [0dd3e49:1432fcf3] in mainline

File:

• uspace/lib/usbhid/src/hiddescriptor.c (modified) (5 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);
@@ -220 +216 @@
                         }
                         else {
-                                usage = report_item->usages[
+                                usage = report_item->usages[
                                         report_item->usages_count- 1]; 
                         }
@@ -245 +241 @@
 
                 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);
-                }
-
-
-                if(report->use_report_ids != 0) {
+                
+                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;
                         report->use_report_ids = 1;
                 }
-
                 field->item_flags = report_item->item_flags;
 
@@ -329 +315 @@
                 usb_hid_report_type_t type) {
 
-        if(report == NULL) {
-                return NULL;
-        }
-
         link_t *report_it = report->reports.next;
         usb_hid_report_description_t *report_des = NULL;
@@ -340 +322 @@
                                 usb_hid_report_description_t, link);
 
-                // if report id not set, return the first of the type
-                if(((report_des->report_id == report_id) || (report_id == 0)) && 
+                if((report_des->report_id == report_id) && 
                    (report_des->type == type)) { 
                         return report_des;