Changeset b917098 in mainline for libc/generic/io/stream.c

Timestamp:

2006-06-02T16:33:42Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

a805c24

Parents:

b1f51f0

Message:

Slowly porting tetris screen… not yet done.

File:

• libc/generic/io/stream.c (modified) (8 diffs)

libc/generic/io/stream.c

@@ -40 +40 @@
 #include <console.h>
 #include <unistd.h>
+#include <async.h>
 
 #define FDS 32
@@ -47 +48 @@
         preadfn_t r;
         void * param;
+        int phone;
 } stream_t;
 
-int console_phone = -1;
-
-stream_t streams[FDS] = {{0, 0, 0}};
+static int console_phone = -1;
+static stream_t streams[FDS] = {{0, 0, 0, -1}};
 
 static ssize_t write_stderr(void *param, const void *buf, size_t count)
@@ -64 +65 @@
 
         while (i < count) {
-                if (ipc_call_sync_2(console_phone, CONSOLE_GETCHAR, 0, 0, &r0, &r1) < 0) {
+                if (sync_send_2(streams[0].phone, CONSOLE_GETCHAR, 0, 0, &r0, &r1) < 0) {
                         return -1;
                 }
@@ -78 +79 @@
 
         for (i = 0; i < count; i++)
-                send_call(console_phone, CONSOLE_PUTCHAR, ((const char *)buf)[i]);
+                send_call(streams[1].phone, CONSOLE_PUTCHAR, ((const char *)buf)[i]);
         
         return count;
@@ -99 +100 @@
         stream.r = read_stdin;
         stream.param = 0;
+        stream.phone = console_phone;
+        
         return stream;
 }
@@ -106 +109 @@
         stream_t stream;
         int res;
-        
+
         if (console_phone < 0) {
                 while ((console_phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0)) < 0) {
@@ -139 +142 @@
         
         if (!strcmp(fname, "stdout")) {
-                //streams[c].w = write_stdout;
-                //return c;
                 streams[c] = open_stdout();
                 return c;
@@ -172 +173 @@
 }
 
+int get_fd_phone(int fd)
+{
+        if (fd >= FDS || fd < 0)
+                return -1;
+        return streams[fd].phone;
+}