Changes in uspace/lib/usb/src/hidparser.c [2f4b3a4:d012590] in mainline

File:

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

uspace/lib/usb/src/hidparser.c

@@ -1239 +1239 @@
                                 }
 
-                                size_t shift = offset%8;
+                                size_t shift=0;
+                                if(((offset+length)%8) > 0) {
+                                        shift = (8- ((offset+length)%8));
+                                }
 
                                 value = value << shift;                                                 
@@ -1248 +1251 @@
                                 // je to ve dvou!! FIXME: melo by to umet delsi jak 2
 
-                                // konec prvniho -- dolni x bitu
+                                // konec prvniho
                                 tmp_value = value;
+                                tmp_value = tmp_value >> (8 - (offset%8) - 1);
                                 tmp_value = tmp_value & ((1 << (8-(offset%8)))-1);                              
-                                tmp_value = tmp_value << (offset%8);
 
                                 buffer[offset/8] = buffer[offset/8] | tmp_value;
 
-                                // a ted druhej -- hornich length-x bitu
-                                value = value >> (8 - (offset % 8));
-                                value = value & ((1 << (length - (8 - (offset % 8)))) - 1);
+                                // a ted druhej
+                                value = value & ((1 << (length - (8 - (offset%8))))-1);
+                                value = value << (8 - (length - (8 - (offset%8))));
                                 
                                 buffer[(offset+length-1)/8] = buffer[(offset+length-1)/8] | value;