Changeset 9b78020 in mainline for uspace/drv/usbhid/kbd/kbddev.c

Timestamp:

2011-04-22T10:21:56Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

308a5d5

Parents:

1775ebc (diff), 7304663 (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:

Merged fixes from maklf

File:

• uspace/drv/usbhid/kbd/kbddev.c (modified) (2 diffs)

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