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

Timestamp:

2011-05-07T10:05:14Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

28216a0

Parents:

beee81a (diff), bc02b83 (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:

Merge development/ changes

File:

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

uspace/drv/usbhid/kbd/kbddev.c

@@ -255 +255 @@
         
         if (hid_dev == NULL || hid_dev->data == NULL) {
+                usb_log_debug("default_connection_handler: "
+                    "Missing parameter.\n");
                 async_answer_0(icallid, EINVAL);
                 return;
@@ -267 +269 @@
 
                 if (kbd_dev->console_phone != -1) {
+                        usb_log_debug("default_connection_handler: "
+                            "console phone already set\n");
                         async_answer_0(icallid, ELIMIT);
                         return;
@@ -272 +276 @@
 
                 kbd_dev->console_phone = callback;
+                
+                usb_log_debug("default_connection_handler: OK\n");
                 async_answer_0(icallid, EOK);
                 return;
         }
         
+        usb_log_debug("default_connection_handler: Wrong function.\n");
         async_answer_0(icallid, EINVAL);
 }
@@ -555 +562 @@
                         usb_log_debug2("Key pressed: %d (keycode: %d)\n", key,
                             kbd_dev->keys[i]);
-                        usb_kbd_push_ev(hid_dev, kbd_dev, KEY_PRESS, key);
                         if (!usb_kbd_is_lock(key)) {
                                 usb_kbd_repeat_start(kbd_dev, key);
                         }
+                        usb_kbd_push_ev(hid_dev, kbd_dev, KEY_PRESS, key);
                 } else {
                         // found, nothing happens