Changeset 25eec4e in mainline for uspace/app/mkbd/main.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 mainline chages.

File:

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

uspace/app/mkbd/main.c

@@ -40 +40 @@
 #include <errno.h>
 #include <str_error.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <getopt.h>
 #include <devman.h>
@@ -178 +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",
@@ -186 +186 @@
                 }
 
-                if (ev.key == KC_ESCAPE) {
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS &&
+                    ev.ev.key.key == KC_ESCAPE) {
                         break;
                 }