Changeset ea15a89a in mainline for uspace/app/tester/ipc/starve.c

Timestamp:

2013-04-29T14:26:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

533e2d7, 94dfb92

Parents:

b2fa2d86 (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/tester/ipc/starve.c (modified) (1 diff)

uspace/app/tester/ipc/starve.c

@@ -62 +62 @@
                         break;
                 
-                kbd_event_t ev;
+                cons_event_t ev;
                 suseconds_t timeout = 0;
-                bool has_event = console_get_kbd_event_timeout(console, &ev, &timeout);
-                if (has_event && (ev.type == KEY_PRESS)) {
-                        TPRINTF("Key %d pressed, terminating.\n", ev.key);
+                bool has_event = console_get_event_timeout(console, &ev, &timeout);
+                if (has_event && ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
+                        TPRINTF("Key %d pressed, terminating.\n", ev.ev.key.key);
                         break;
                 }