Changeset aa2b32c in mainline for uspace/app/mkbd/main.c

Timestamp:

2013-04-29T12:44:05Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a269d05

Parents:

06b0211b (diff), 9e7898e (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 changes

File:

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

uspace/app/mkbd/main.c

@@ -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;
                 }