Changeset 0c25c10 in mainline for uspace/app/tetris/input.c

Timestamp:

2009-06-03T19:32:07Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

69e68e3

Parents:

cbff4c2

Message:

update for latest I/O changes

File:

• uspace/app/tetris/input.c (modified) (4 diffs)

uspace/app/tetris/input.c

@@ -58 +58 @@
 
 #include <async.h>
+#include <vfs/vfs.h>
+#include <io/console.h>
 #include <ipc/console.h>
-#include <console.h>
-#include <kbd/kbd.h>
 
 /* return true iff the given timeval is positive */
@@ -99 +99 @@
         static ipc_call_t charcall;
         ipcarg_t rc;
-        int cons_phone;
 
         /*
@@ -116 +115 @@
 again:
                 if (!getchar_inprog) {
-                        cons_phone = console_open(true);
-                        getchar_inprog = async_send_2(cons_phone,
-                            CONSOLE_GETKEY, 0, 0, &charcall);
+                        getchar_inprog = async_send_0(fphone(stdin),
+                            CONSOLE_GET_EVENT, &charcall);
                 }
-                if (!s) 
+                if (!s)
                         async_wait_for(getchar_inprog, &rc);
                 else if (async_wait_timeout(getchar_inprog, &rc, s->tv_usec) == ETIMEOUT) {
@@ -131 +129 @@
                         stop("end of file, help");
                 }
-                if (IPC_GET_ARG1(charcall) == KE_RELEASE)
+                if (IPC_GET_ARG1(charcall) == KEY_RELEASE)
                         goto again;