Changeset 3558ba93 in mainline for uspace/dist/src/c/demos/tetris/screen.c

Timestamp:

2013-12-09T15:55:40Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5b89d43b

Parents:

12735849 (diff), 9521eca (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 GCC port updates

This commit includes various small changes needed to compile GCC or
dependent libraries on more architectures than ia32.

A lot of ARM EABI functions (softfloat) were added, mostly as aliases
to already existing ones.

A generic implementation of long jump was added, based on context save
and restore functions.

Examples in src/c/ were updated to be compilable again and new scripts
for compiling with GCC were added.

New uspace/overlay directory was added that is verbatim copied into the
final image. Cleaning its content is left to the user.

A small `untar' utility was implemented for unpacking tarballs (it does
not support the standard switches nor a compressed content).

Merged branch: lp:~vojtech-horky/helenos/gcc-port

File:

• uspace/dist/src/c/demos/tetris/screen.c (modified) (3 diffs)

uspace/dist/src/c/demos/tetris/screen.c

@@ -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;
         }