Subversion Repositories HelenOS-historic

Rev

Rev 1518 | Rev 1536 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1518 Rev 1519
Line 37... Line 37...
37 
#include <ipc/ns.h>
 37 
#include <ipc/ns.h>
38 
#include <ipc/fb.h>
 38 
#include <ipc/fb.h>
39 
#include <ipc/services.h>
 39 
#include <ipc/services.h>
40 
#include <console.h>
 40 
#include <console.h>
41 
#include <unistd.h>
 41 
#include <unistd.h>
- 
 
 42 
#include <async.h>
42 
 
 43 
 
43 
#define FDS 32
 44 
#define FDS 32
44 
 
 45 
 
45 
typedef struct stream_t {
 46 
typedef struct stream_t {
46 
    pwritefn_t w;
 47 
    pwritefn_t w;
47 
    preadfn_t r;
 48 
    preadfn_t r;
48 
    void * param;
 49 
    void * param;
- 
 
 50 
    int phone;
49 
} stream_t;
 51 
} stream_t;
50 
 
 52 
 
51 
int console_phone = -1;
 53 
static int console_phone = -1;
52 
 
 - 
 
53 
stream_t streams[FDS] = {{0, 0, 0}};
 54 
static stream_t streams[FDS] = {{0, 0, 0, -1}};
54 
 
 55 
 
55 
static ssize_t write_stderr(void *param, const void *buf, size_t count)
 56 
static ssize_t write_stderr(void *param, const void *buf, size_t count)
56 
{
 57 
{
57 
    return count;
 58 
    return count;
58 
}
 59 
}
Line 61... Line 62...
61 
{
 62 
{
62 
    ipcarg_t r0,r1;
 63 
    ipcarg_t r0,r1;
63 
    size_t i = 0;
 64 
    size_t i = 0;
64 
 
 65 
 
65 
    while (i < count) {
 66 
    while (i < count) {
66 
        if (ipc_call_sync_2(console_phone, CONSOLE_GETCHAR, 0, 0, &r0, &r1) < 0) {
 67 
        if (sync_send_2(streams[0].phone, CONSOLE_GETCHAR, 0, 0, &r0, &r1) < 0) {
67 
            return -1;
 68 
            return -1;
68 
        }
 69 
        }
69 
        ((char *)buf)[i++] = r0;
 70 
        ((char *)buf)[i++] = r0;
70 
    }
 71 
    }
71 
    return i;
 72 
    return i;
Line 75... Line 76...
75 
{
 76 
{
76 
    int i;
 77 
    int i;
77 
    ipcarg_t r0,r1;
 78 
    ipcarg_t r0,r1;
78 
 
 79 
 
79 
    for (i = 0; i < count; i++)
 80 
    for (i = 0; i < count; i++)
80 
        send_call(console_phone, CONSOLE_PUTCHAR, ((const char *)buf)[i]);
 81 
        send_call(streams[1].phone, CONSOLE_PUTCHAR, ((const char *)buf)[i]);
81 
   
 82 
   
82 
    return count;
 83 
    return count;
83 
}
 84 
}
84 
 
 85 
 
85 
 
 86 
 
Line 96... Line 97...
96 
        }
 97 
        }
97 
    }
 98 
    }
98 
   
 99 
   
99 
    stream.r = read_stdin;
 100 
    stream.r = read_stdin;
100 
    stream.param = 0;
 101 
    stream.param = 0;
- 
 
 102 
    stream.phone = console_phone;
- 
 
 103 
   
101 
    return stream;
 104 
    return stream;
102 
}
 105 
}
103 
 
 106 
 
104 
static stream_t open_stdout(void)
 107 
static stream_t open_stdout(void)
105 
{
 108 
{
106 
    stream_t stream;
 109 
    stream_t stream;
107 
    int res;
 110 
    int res;
108 
   
 111 
 
109 
    if (console_phone < 0) {
 112 
    if (console_phone < 0) {
110 
        while ((console_phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0)) < 0) {
 113 
        while ((console_phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0)) < 0) {
111 
            usleep(10000);
 114 
            usleep(10000);
112 
        }
 115 
        }
113 
    }
 116 
    }
Line 136... Line 139...
136 
        streams[c] = open_stdin();
 139 
        streams[c] = open_stdin();
137 
        return c;
 140 
        return c;
138 
    }
 141 
    }
139 
   
 142 
   
140 
    if (!strcmp(fname, "stdout")) {
 143 
    if (!strcmp(fname, "stdout")) {
141 
        //streams[c].w = write_stdout;
 - 
 
142 
        //return c;
 - 
 
143 
        streams[c] = open_stdout();
 144 
        streams[c] = open_stdout();
144 
        return c;
 145 
        return c;
145 
    }
 146 
    }
146 
   
 147 
   
147 
    if (!strcmp(fname, "stderr")) {
 148 
    if (!strcmp(fname, "stderr")) {
Line 169... Line 170...
169 
        return streams[fd].r(streams[fd].param, buf, count);
 170 
        return streams[fd].r(streams[fd].param, buf, count);
170 
   
 171 
   
171 
    return 0;
 172 
    return 0;
172 
}
 173 
}
173 
 
 174 
 
- 
 
 175 
int get_fd_phone(int fd)
- 
 
 176 
{
- 
 
 177 
    if (fd >= FDS || fd < 0)
- 
 
 178 
        return -1;
- 
 
 179 
    return streams[fd].phone;
- 
 
 180 
}