Changeset 7351dc3 in mainline

Timestamp:

2011-03-10T18:43:13Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e69f10b

Parents:

2f593872 (diff), 60a228f (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:

Merged bugfix

File:

• uspace/lib/usb/src/hidparser.c (modified) (7 diffs)

uspace/lib/usb/src/hidparser.c

@@ -112 +112 @@
         usb_hid_report_item_t *new_report_item;
 
-        size_t offset=0;
+        size_t offset_input=0;
+        size_t offset_output=0;
+        size_t offset_feature=0;
         
 
@@ -118 +120 @@
                 return ENOMEM;
         }
+        memset(report_item, 0, sizeof(usb_hid_report_item_t));
+        
         link_initialize(&(report_item->link));  
 
@@ -143 +147 @@
                                         // store report item to report and create the new one
                                         usb_log_debug("\nNEW REPORT ITEM: %X",tag);
-
-                                        report_item->offset = offset;
-                                        offset += report_item->count * report_item->size;
                                         
                                         switch(tag) {
                                                 case USB_HID_REPORT_TAG_INPUT:
+                                                        report_item->offset = offset_input;
+                                                        offset_input += report_item->count * report_item->size;
                                                         usb_log_debug(" - INPUT\n");
                                                         list_append(&(report_item->link), &(parser->input));
                                                         break;
                                                 case USB_HID_REPORT_TAG_OUTPUT:
+                                                        report_item->offset = offset_output;
+                                                        offset_output += report_item->count * report_item->size;
                                                         usb_log_debug(" - OUTPUT\n");
                                                                 list_append(&(report_item->link), &(parser->output));
@@ -158 +163 @@
                                                         break;
                                                 case USB_HID_REPORT_TAG_FEATURE:
+                                                        report_item->offset = offset_feature;
+                                                        offset_feature += report_item->count * report_item->size;
                                                         usb_log_debug(" - FEATURE\n");
                                                                 list_append(&(report_item->link), &(parser->feature));
@@ -652 +659 @@
         }
 
-        if((item->physical_minimum == 0) && (item->physical_maximum ==0)) {
+        if((item->physical_minimum == 0) && (item->physical_maximum == 0)) {
                 item->physical_minimum = item->logical_minimum;
                 item->physical_maximum = item->logical_maximum;         
         }
 
-        resolution = (item->logical_maximum - item->logical_minimum) / ((item->physical_maximum - item->physical_minimum) * (usb_pow(10,(item->unit_exponent))));
+        if(item->physical_maximum == item->physical_minimum){
+            resolution = 1;
+        }
+        else {
+            resolution = (item->logical_maximum - item->logical_minimum) / 
+                ((item->physical_maximum - item->physical_minimum) * 
+                (usb_pow(10,(item->unit_exponent))));
+        }
         offset = item->offset + (j * item->size);
         
@@ -694 +708 @@
 
                 usb_log_debug2("offset %d\n", offset);
+        
                 usb_log_debug2("foo %x\n", *foo);
                 usb_log_debug2("maska %x\n",  mask);
@@ -699 +714 @@
         }
 
-        usb_log_debug2("---\n\n");
+        usb_log_debug2("---\n\n"); 
 
         return (int)(((value - item->logical_minimum) / resolution) + item->physical_minimum);