Changeset 0c25c10 in mainline

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

Location:

uspace/app

Files:

• klog/klog.c (modified) (3 diffs)
• tetris/input.c (modified) (4 diffs)
• tetris/scores.c (modified) (3 diffs)
• tetris/screen.c (modified) (7 diffs)
• tetris/screen.h (modified) (1 diff)

uspace/app/klog/klog.c

@@ -41 +41 @@
 #include <as.h>
 #include <sysinfo.h>
-#include <io/stream.h>
-#include <console.h>
 #include <event.h>
 #include <errno.h>
+#include <io/klog.h>
 
-#define NAME "klog"
+#define NAME  "klog"
 
 /* Pointer to klog area */
 static wchar_t *klog;
-static count_t klog_length;
+static size_t klog_length;
 
 static void interrupt_received(ipc_callid_t callid, ipc_call_t *call)
@@ -56 +55 @@
         async_serialize_start();
         
-        count_t klog_start = (count_t) IPC_GET_ARG1(*call);
-        count_t klog_len = (count_t) IPC_GET_ARG2(*call);
-        count_t klog_stored = (count_t) IPC_GET_ARG3(*call);
-        count_t i;
+        size_t klog_start = (size_t) IPC_GET_ARG1(*call);
+        size_t klog_len = (size_t) IPC_GET_ARG2(*call);
+        size_t klog_stored = (size_t) IPC_GET_ARG3(*call);
+        size_t i;
         
         for (i = klog_len - klog_stored; i < klog_len; i++)
@@ -69 +68 @@
 int main(int argc, char *argv[])
 {
-        console_wait();
-        
-        count_t klog_pages = sysinfo_value("klog.pages");
+        size_t klog_pages = sysinfo_value("klog.pages");
         size_t klog_size = klog_pages * PAGE_SIZE;
         klog_length = klog_size / sizeof(wchar_t);

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;
 

uspace/app/tetris/scores.c

@@ -56 +56 @@
 /* #include <stdlib.h> */
 #include <string.h>
-#include <kbd/kbd.h>
-#include <kbd/keycode.h>
+#include <io/console.h>
+#include <io/keycode.h>
+#include <vfs/vfs.h>
 #include <stdlib.h>
 /* #include <time.h> */
@@ -128 +129 @@
         int i,j;
         size_t off;
-        kbd_event_t ev;
+        console_event_t ev;
         
         clear_screen();
@@ -142 +143 @@
         while (1) {
                 fflush(stdout);
-                if (kbd_get_event(&ev) != EOK)
+                if (!console_get_event(fphone(stdin), &ev))
                         exit(1);
 
-                if (ev.type == KE_RELEASE)
+                if (ev.type == KEY_RELEASE)
                         continue;
 

uspace/app/tetris/screen.c

@@ -51 +51 @@
 #include <string.h>
 #include <unistd.h>
-#include <console.h>
-
+#include <vfs/vfs.h>
 #include <async.h>
 #include "screen.h"
 #include "tetris.h"
-#include <ipc/console.h>
+#include <io/console.h>
 
 static cell curscreen[B_SIZE];  /* 1 => standout (or otherwise marked) */
@@ -65 +64 @@
 /*
  * putstr() is for unpadded strings (either as in termcap(5) or
- * simply literal strings); 
+ * simply literal strings);
  */
 static inline void putstr(char *s)
@@ -75 +74 @@
 static void start_standout(void)
 {
-        console_set_rgb_color(0xf0f0f0, 0);
+        console_set_rgb_color(fphone(stdout), 0xf0f0f0, 0);
 }
 
 static void resume_normal(void)
 {
-        console_set_rgb_color(0, 0xf0f0f0);
+        console_set_rgb_color(fphone(stdout), 0, 0xf0f0f0);
 }
 
 void clear_screen(void)
 {
-        console_clear();
+        console_clear(fphone(stdout));
         moveto(0, 0);
 }
@@ -97 +96 @@
 
         resume_normal();
-        console_clear();
+        console_clear(fphone(stdout));
         curscore = -1;
         memset((char *)curscreen, 0, sizeof(curscreen));
@@ -108 +107 @@
 scr_init(void)
 {
-        console_cursor_visibility(0);
+        console_cursor_visibility(fphone(stdout), 0);
         resume_normal();
         scr_clear();
@@ -115 +114 @@
 void moveto(int r, int c)
 {
-        console_goto(r, c);
+        console_goto(fphone(stdout), c, r);
 }
 
@@ -122 +121 @@
 static int get_display_size(winsize_t *ws)
 {
-        return console_get_size(&ws->ws_row, &ws->ws_col);
+        return console_get_size(fphone(stdout), &ws->ws_col, &ws->ws_row);
 }
 

uspace/app/tetris/screen.h

@@ -47 +47 @@
 #define putpad(s)       tputs(s, 1, put)
 
+#include <sys/types.h>
 #include <async.h>
 
 typedef struct {
-        int ws_row;
-        int ws_col;
+        ipcarg_t ws_row;
+        ipcarg_t ws_col;
 } winsize_t;