Changeset ace12560 in mainline for uspace/drv/usbhid/main.c

Timestamp:

2011-02-20T21:52:43Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

b317b0b, d37b235

Parents:

62066b4 (diff), 41e645c (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:

yet another merge with usb/development

File:

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

uspace/drv/usbhid/main.c

@@ -265 +265 @@
         for (i = 0; i < count; ++i) {
                 printf("%d ", key_codes[i]);
+        }
+        printf("\n");
+
+        for (i = 0; i < count; ++i) {
                 // TODO: Key press / release
 
                 // TODO: NOT WORKING
                 unsigned int key = usbkbd_parse_scancode(key_codes[i]);
+
+                if (key == 0) {
+                        continue;
+                }
                 kbd_push_ev(KEY_PRESS, key);
         }
@@ -348 +356 @@
                 {
                         .pipe = &kbd_dev->poll_pipe,
-                        .description = &poll_endpoint_description
+                        .description = &poll_endpoint_description,
+                        .interface_no =
+                            usb_device_get_assigned_interface(kbd_dev->device)
                 }
         };