Changeset 94c0dcbd in mainline for uspace/lib/usb/src/hidparser.c

Timestamp:

2011-04-28T12:32:08Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

956e8ea

Parents:

308a5d5 (diff), 28d7185 (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:

Changes from maklf - extended usages

File:

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

uspace/lib/usb/src/hidparser.c

@@ -175 +175 @@
                 if(report_item->usages_count > 0 && ((report_item->usage_minimum == 0) && (report_item->usage_maximum == 0))) {
                         uint32_t usage;
-                        if(report_item->type == USB_HID_REPORT_TYPE_INPUT) {
+                        if(report_item->type != USB_HID_REPORT_TYPE_INPUT) {
                                 if(i < report_item->usages_count){
                                         usage = report_item->usages[i];
@@ -193 +193 @@
 
                                                 
-                        if((usage & 0xFF00) != 0){
+                        if((usage & 0xFFFF0000) != 0){
                                 field->usage_page = (usage >> 16);                                      
-                                field->usage = (usage & 0xFF);
+                                field->usage = (usage & 0xFFFF);
                         }
                         else {