Changeset d600874 in mainline

Timestamp:

2011-05-30T11:40:58Z (13 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

Location:

uspace/lib/usbhid/src

Files:

• hiddescriptor.c (modified) (3 diffs)
• hidparser.c (modified) (9 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;
 

uspace/lib/usbhid/src/hidparser.c

@@ -153 +153 @@
 
 
-        report_des = usb_hid_report_find_description(report, *report_id, type);
+        report_des = usb_hid_report_find_description(report, *report_id, 
+                type);
+
         if(report_des == NULL) {
                 return EINVAL;
@@ -167 +169 @@
                 if(USB_HID_ITEM_FLAG_CONSTANT(item->item_flags) == 0) {
                         
-                        if(USB_HID_ITEM_FLAG_VARIABLE(item->item_flags) == 0) {
+                        if(USB_HID_ITEM_FLAG_VARIABLE(item->item_flags) == 0){
 
                                 // array
@@ -174 +176 @@
                 
                                 item->usage = USB_HID_EXTENDED_USAGE(
-                                    item->usages[item->value - item->physical_minimum]);
-
-                                item->usage_page = USB_HID_EXTENDED_USAGE_PAGE(
-                                    item->usages[item->value - item->physical_minimum]);
-
-                                usb_hid_report_set_last_item (item->collection_path, 
-                                    USB_HID_TAG_CLASS_GLOBAL, item->usage_page);
-
-                                usb_hid_report_set_last_item (item->collection_path, 
+                                    item->usages[
+                                    item->value - item->physical_minimum]);
+
+                                item->usage_page = 
+                                    USB_HID_EXTENDED_USAGE_PAGE(
+                                    item->usages[
+                                    item->value - item->physical_minimum]);
+
+                                usb_hid_report_set_last_item (
+                                    item->collection_path, 
+                                    USB_HID_TAG_CLASS_GLOBAL, 
+                                    item->usage_page);
+
+                                usb_hid_report_set_last_item (
+                                    item->collection_path, 
                                     USB_HID_TAG_CLASS_LOCAL, item->usage);
                                 
@@ -188 +196 @@
                         else {
                                 // variable item
-                                item->value = usb_hid_translate_data(item, data);                               
-                        }                               
+                                item->value = usb_hid_translate_data(item, 
+                                    data);                              
+                        }                       
                 }
                 list_item = list_item->next;
@@ -213 +222 @@
         
         int32_t value=0;
-        int32_t mask;
-        const uint8_t *foo;
+        int32_t mask=0;
+        const uint8_t *foo=0;
 
         // now only shot tags are allowed
@@ -240 +249 @@
         if((size_t)(offset/8) != (size_t)((offset+item->size-1)/8)) {
                 
-                part_size = ((offset+item->size)%8);
+                part_size = 0;
 
                 size_t i=0;
@@ -246 +255 @@
                         if(i == (size_t)(offset/8)) {
                                 // the higher one
+                                part_size = 8 - (offset % 8);
                                 foo = data + i;
                                 mask =  ((1 << (item->size-part_size))-1);
-                                value = (*foo & mask) << part_size;
+                                value = (*foo & mask);
                         }
                         else if(i == ((offset+item->size-1)/8)){
                                 // the lower one
                                 foo = data + i;
-                                mask =  ((1 << part_size)-1) << (8-part_size);
-                                value += ((*foo & mask) >> (8-part_size));
+                                mask = ((1 << (item->size - part_size)) - 1) 
+                                        << (8 - (item->size - part_size));
+
+                                value = (((*foo & mask) >> (8 - 
+                                    (item->size - part_size))) << part_size ) 
+                                    + value;
                         }
                         else {
-                                value = value << 8;
-                                value += *(data + 1);
+                                value = (*(data + 1) << (part_size + 8)) + value;
+                                part_size += 8;
                         }
                 }
@@ -375 +389 @@
                 report_item = list_get_instance(item, usb_hid_report_field_t, link);
 
-                if(USB_HID_ITEM_FLAG_VARIABLE(report_item->item_flags) == 0) {
-                                        
-                        // array
-                        value = usb_hid_translate_data_reverse(report_item, 
-                                report_item->value);
-
-                        offset = report_item->offset;
-                        length = report_item->size;
-                }
-                else {
-                        // variable item
-                        value  = usb_hid_translate_data_reverse(report_item, 
-                                report_item->value);
-
-                        offset = report_item->offset;
-                        length = report_item->size;
-                }
-
+                value = usb_hid_translate_data_reverse(report_item, 
+                        report_item->value);
+
+                offset = report_des->bit_length - report_item->offset - 1;
+                length = report_item->size;
+                
                 usb_log_debug("\ttranslated value: %x\n", value);
 
@@ -617 +619 @@
                         return report_des->report_id;
                 }
+
+                report_it = report_it->next;
         }