Changeset 2f4b3a4 in mainline

Timestamp:

2011-04-01T11:50:15Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

ad7bb42

Parents:

d012590

Message:

output report items order fix

File:

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

uspace/lib/usb/src/hidparser.c

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