Changes in uspace/app/mkbd/main.c [5debe97:07b7c48] in mainline

File:

• uspace/app/mkbd/main.c (modified) (4 diffs)

uspace/app/mkbd/main.c

@@ -44 +44 @@
 #include <devman.h>
 #include <loc.h>
+#include <usb/dev/hub.h>
 #include <usb/hid/iface.h>
 #include <usb/dev/pipes.h>
@@ -177 +178 @@
 
         while (1) {
-                kbd_event_t ev;
-                bool ok = console_get_kbd_event(con, &ev);
+                cons_event_t ev;
+                bool ok = console_get_event(con, &ev);
                 if (!ok) {
                         printf("Connection with console broken: %s.\n",
@@ -185 +186 @@
                 }
 
-                if (ev.key == KC_ESCAPE) {
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS &&
+                    ev.ev.key.key == KC_ESCAPE) {
                         break;
                 }
@@ -222 +224 @@
         devman_handle_t dev_handle = 0;
         
-        int rc = usb_resolve_device_handle(devpath, &dev_handle);
+        int rc = usb_resolve_device_handle(devpath, NULL, NULL, &dev_handle);
         if (rc != EOK) {
                 printf("Device not found or not of USB kind: %s.\n",