Changeset 7304663 in mainline

Timestamp:

2011-04-22T10:10:40Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

28d7185, 9b78020

Parents:

cf2ccd4

Message:

Tiket #200 fixed

Location:

uspace

Files:

• drv/usbhid/kbd/kbddev.c (modified) (2 diffs)
• lib/usb/src/hidparser.c (modified) (1 diff)

uspace/drv/usbhid/kbd/kbddev.c

@@ -694 +694 @@
         while (field != NULL) {
                 usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)\n", 
-                    field, field->value, field->value);
+                    field, field->value, field->usage);
                 
                 assert(i < kbd_dev->key_count);
@@ -709 +709 @@
                  *       two parts of the Report somehow.
                  */
-                kbd_dev->keys[i] = field->value;
+                if( field->value != 0 ) {
+                        kbd_dev->keys[i] = field->usage;
+                }
+                else {
+                        kbd_dev->keys[i] = 0;
+                }
                 usb_log_debug2("Saved %u. key usage %d\n", i, kbd_dev->keys[i]);
                 

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];