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

uspace/app/tetris/screen.c

@@ -61 +61 @@
 #include <vfs/vfs.h>
 #include <async.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <io/console.h>
 #include <io/style.h>
@@ -344 +344 @@
         
         while (timeout > 0) {
-                kbd_event_t event;
-                
-                if (!console_get_kbd_event_timeout(console, &event, &timeout))
+                cons_event_t event;
+                
+                if (!console_get_event_timeout(console, &event, &timeout))
                         break;
         }
@@ -376 +376 @@
         
         while (c == 0) {
-                kbd_event_t event;
-                
-                if (!console_get_kbd_event_timeout(console, &event, &timeleft)) {
+                cons_event_t event;
+                
+                if (!console_get_event_timeout(console, &event, &timeleft)) {
                         timeleft = 0;
                         return -1;
                 }
                 
-                if (event.type == KEY_PRESS)
-                        c = event.c;
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
+                        c = event.ev.key.c;
         }
         
@@ -398 +398 @@
         
         while (c == 0) {
-                kbd_event_t event;
-                
-                if (!console_get_kbd_event(console, &event))
+                cons_event_t event;
+                
+                if (!console_get_event(console, &event))
                         return -1;
                 
-                if (event.type == KEY_PRESS)
-                        c = event.c;
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
+                        c = event.ev.key.c;
         }