Changeset aa2b32c in mainline for uspace/app/msim/arch_helenos/input.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/msim/arch_helenos/input.c (modified) (1 diff)

uspace/app/msim/arch_helenos/input.c

@@ -91 +91 @@
 bool stdin_poll(char *key)
 {
-        kbd_event_t ev;
+        cons_event_t ev;
         suseconds_t timeout = 0;
         errno = EOK;
         console_flush(input_prompt->console);
-        bool has_input = console_get_kbd_event_timeout(input_prompt->console, &ev, &timeout);
+        bool has_input = console_get_event_timeout(input_prompt->console, &ev, &timeout);
         if (!has_input) {
                 return false;
         }
 
-        if (ev.type != KEY_PRESS)
+        if (ev.type != CEV_KEY || ev.ev.key.type != KEY_PRESS)
                 return false;
 
-        *key = ev.c;
+        *key = ev.ev.key.c;
 
         return true;