Changeset 25eec4e in mainline for uspace/app/nterm/nterm.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/nterm/nterm.c (modified) (3 diffs)

uspace/app/nterm/nterm.c

@@ -33 +33 @@
  */
 
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <io/console.h>
@@ -109 +109 @@
 int main(int argc, char *argv[])
 {
-        kbd_event_t ev;
+        cons_event_t ev;
         int rc;
 
@@ -129 +129 @@
         done = false;
         while (!done) {
-                console_get_kbd_event(con, &ev);
-                if (ev.type == KEY_PRESS)
-                        key_handle(&ev);
+                console_get_event(con, &ev);
+                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS)
+                        key_handle(&ev.ev.key);
         }