Changeset 86029498 in mainline

Timestamp:

2006-06-02T21:53:26Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

59ed572

Parents:

2408969

Message:

Small changes to tetris.

Files:

• libc/generic/async.c (modified) (2 diffs)
• libc/include/sys/time.h (modified) (1 diff)
• tetris/input.c (modified) (5 diffs)
• tetris/screen.c (modified) (5 diffs)

libc/generic/async.c

@@ -286 +286 @@
         
         assert(PS_connection);
+
+        if (usecs < 0) /* TODO: let it get through the ipc_call once */
+                return 0;
 
         futex_down(&async_futex);
@@ -656 +659 @@
         connection_t *conn;
 
+        /* TODO: Let it go through the event read at least once */
+        if (timeout < 0)
+                return ETIMEOUT;
+
         futex_down(&async_futex);
         if (msg->done) {

libc/include/sys/time.h

@@ -34 +34 @@
 #define DST_NONE 0
 
-typedef sysarg_t time_t;
-typedef sysarg_t suseconds_t;
+typedef long time_t;
+typedef long suseconds_t;
 
 struct timeval {

tetris/input.c

@@ -42 +42 @@
 #include <sys/types.h>
 #include <sys/time.h>
+#include <stdio.h>
 
 #include <errno.h>
@@ -91 +92 @@
         int rc;
 
-#define NILTZ ((struct timezone *)0)
-
         /*
          * Someday, select() will do this for us.
@@ -99 +98 @@
          */
         if (tvp) {
-                (void) gettimeofday(&starttv, NILTZ);
+                (void) gettimeofday(&starttv, NULL);
                 endtv = *tvp;
                 s = &endtv;
@@ -108 +107 @@
                 if (!getchar_inprog)
                         getchar_inprog = async_send_2(1,CONSOLE_GETCHAR,0,0,&charcall);
-                if (async_wait_timeout(getchar_inprog, &rc, s->tv_usec) == ETIMEOUT) {
+                if (!s) 
+                        async_wait_for(getchar_inprog, &rc);
+                else if (async_wait_timeout(getchar_inprog, &rc, s->tv_usec) == ETIMEOUT) {
                         tvp->tv_sec = 0;
                         tvp->tv_usec = 0;
@@ -121 +122 @@
         if (tvp) {
                 /* since there is input, we may not have timed out */
-                (void) gettimeofday(&endtv, NILTZ);
+                (void) gettimeofday(&endtv, NULL);
                 TV_SUB(&endtv, &starttv);
                 TV_SUB(tvp, &endtv);    /* adjust *tvp by elapsed time */

tetris/screen.c

@@ -160 +160 @@
                 char smallscr[55];
 
-                (void)snprintf(smallscr, sizeof(smallscr),
+                snprintf(smallscr, sizeof(smallscr),
                     "the screen is too small (must be at least %dx%d)",
                     MINROWS, MINCOLS);
@@ -204 +204 @@
         if (score != curscore) {
                 moveto(0, 0);
-                (void) printf("Score: %d", score);
+                printf("Score: %d", score);
                 curscore = score;
         }
@@ -252 +252 @@
                         *sp = so;
                         if (i != ccol) {
+                                if (cur_so) {
+                                        resume_normal();
+                                        cur_so = 0;
+                                }
                                 moveto(RTOD(j), CTOD(i));
                         }
@@ -262 +266 @@
                         }
                         putstr("  ");
+
                         ccol = i + 1;
                         /*
@@ -282 +287 @@
                 }
         }
-        resume_normal();
-
+        if (cur_so)
+                resume_normal();
         fflush();
 }