Changeset 1879a7d in mainline for uspace/lib/usb/src/hidparser.c

Timestamp:

2011-01-28T17:20:57Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

76d9eb7e

Parents:

ea991e84 (diff), c113056 (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 development/ changes

File:

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

uspace/lib/usb/src/hidparser.c

@@ -35 +35 @@
 #include <usb/classes/hidparser.h>
 #include <errno.h>
+#include <stdio.h>
 
 /** Parse HID report descriptor.
@@ -120 +121 @@
         item.logical_max = 255;
 
-        if(size != 8){
-                return -1;
+        if (size != 8) {
+                return ERANGE;
         }
 
         uint8_t keys[6];
-        for(i=item.offset; i<item.count; i++) {
-                keys[i-2] = data[i];
+        for (i = 0; i < item.count; i++) {
+                keys[i] = data[i + item.offset];
         }