Changeset af430ce in mainline for uspace/drv

Timestamp:

2011-03-02T15:01:47Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

24aa62c

Parents:

37b1651d (diff), 30db06c (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:

Various small fixes

Location:

uspace/drv/usbhid

Files:

• kbddev.c (modified) (1 diff)
• usbhid.ma (modified) (1 diff)

uspace/drv/usbhid/kbddev.c

@@ -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, 

uspace/drv/usbhid/usbhid.ma

@@ -1 @@
-10 usb&class=hid
-10 usb&class=HID
+100 usb&interface&class=HID&subclass=0x01&protocol=0x01
 10 usb&interface&class=HID
-10 usb&hid