Changeset 0f31e2b in mainline for uspace/drv/usbhid/kbddev.c

Timestamp:

2011-03-03T12:44:33Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

d3594362

Parents:

1c6c4092 (diff), 2c22f1f7 (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 development changes.

File:

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

uspace/drv/usbhid/kbddev.c

@@ -255 +255 @@
         usb_log_debug2("\nLock keys after: 0x%x\n\n", kbd_dev->lock_keys);
         
-        if (key = KC_CAPS_LOCK || key == KC_NUM_LOCK || key == KC_SCROLL_LOCK) {
+        if (key == KC_CAPS_LOCK || key == KC_NUM_LOCK || key == KC_SCROLL_LOCK) {
                 // do not send anything to the console, this is our business
                 return;
@@ -289 +289 @@
 
         usb_log_debug2("Sending key %d to the console\n", ev.key);
-        assert(kbd_dev->console_phone != -1);
+        if (kbd_dev->console_phone < 0) {
+                usb_log_warning(
+                    "Connection to console not ready, key discarded.\n");
+                return;
+        }
         
         async_msg_4(kbd_dev->console_phone, KBD_EVENT, ev.type, ev.key,