Rev 1536 | Rev 1653 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1536 | Rev 1610 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright (C) 2006 Josef Cejka |
2 | * Copyright (C) 2006 Josef Cejka |
3 | * Copyright (C) 2006 Jakub Vana |
3 | * Copyright (C) 2006 Jakub Vana |
4 | * All rights reserved. |
4 | * All rights reserved. |
5 | * |
5 | * |
6 | * Redistribution and use in source and binary forms, with or without |
6 | * Redistribution and use in source and binary forms, with or without |
7 | * modification, are permitted provided that the following conditions |
7 | * modification, are permitted provided that the following conditions |
8 | * are met: |
8 | * are met: |
9 | * |
9 | * |
10 | * - Redistributions of source code must retain the above copyright |
10 | * - Redistributions of source code must retain the above copyright |
11 | * notice, this list of conditions and the following disclaimer. |
11 | * notice, this list of conditions and the following disclaimer. |
12 | * - Redistributions in binary form must reproduce the above copyright |
12 | * - Redistributions in binary form must reproduce the above copyright |
13 | * notice, this list of conditions and the following disclaimer in the |
13 | * notice, this list of conditions and the following disclaimer in the |
14 | * documentation and/or other materials provided with the distribution. |
14 | * documentation and/or other materials provided with the distribution. |
15 | * - The name of the author may not be used to endorse or promote products |
15 | * - The name of the author may not be used to endorse or promote products |
16 | * derived from this software without specific prior written permission. |
16 | * derived from this software without specific prior written permission. |
17 | * |
17 | * |
18 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
18 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
19 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
19 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
20 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
20 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
21 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
21 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
22 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
22 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
23 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
23 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
24 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
24 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
25 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
27 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
28 | */ |
28 | */ |
29 | 29 | ||
30 | 30 | ||
31 | #include <io/io.h> |
31 | #include <io/io.h> |
32 | #include <io/stream.h> |
32 | #include <io/stream.h> |
33 | #include <string.h> |
33 | #include <string.h> |
34 | #include <malloc.h> |
34 | #include <malloc.h> |
35 | #include <libc.h> |
35 | #include <libc.h> |
36 | #include <ipc/ipc.h> |
36 | #include <ipc/ipc.h> |
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 | #include <async.h> |
43 | 43 | ||
44 | #define FDS 32 |
44 | #define FDS 32 |
45 | 45 | ||
46 | typedef struct stream_t { |
46 | typedef struct stream_t { |
47 | pwritefn_t w; |
47 | pwritefn_t w; |
48 | preadfn_t r; |
48 | preadfn_t r; |
49 | void * param; |
49 | void * param; |
50 | int phone; |
50 | int phone; |
51 | } stream_t; |
51 | } stream_t; |
52 | 52 | ||
53 | static int console_phone = -1; |
53 | static int console_phone = -1; |
54 | static stream_t streams[FDS]; |
54 | static stream_t streams[FDS]; |
55 | 55 | ||
56 | 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) |
57 | { |
57 | { |
58 | return count; |
58 | return count; |
59 | } |
59 | } |
60 | 60 | ||
61 | static ssize_t read_stdin(void *param, void *buf, size_t count) |
61 | static ssize_t read_stdin(void *param, void *buf, size_t count) |
62 | { |
62 | { |
63 | ipcarg_t r0,r1; |
63 | ipcarg_t r0,r1; |
64 | size_t i = 0; |
64 | size_t i = 0; |
65 | 65 | ||
66 | while (i < count) { |
66 | while (i < count) { |
67 | if (sync_send_2(streams[0].phone, CONSOLE_GETCHAR, 0, 0, &r0, &r1) < 0) { |
67 | if (async_req_2(streams[0].phone, CONSOLE_GETCHAR, 0, 0, &r0, &r1) < 0) { |
68 | return -1; |
68 | return -1; |
69 | } |
69 | } |
70 | ((char *)buf)[i++] = r0; |
70 | ((char *)buf)[i++] = r0; |
71 | } |
71 | } |
72 | return i; |
72 | return i; |
73 | } |
73 | } |
74 | 74 | ||
75 | static ssize_t write_stdout(void *param, const void *buf, size_t count) |
75 | static ssize_t write_stdout(void *param, const void *buf, size_t count) |
76 | { |
76 | { |
77 | int i; |
77 | int i; |
78 | ipcarg_t r0,r1; |
78 | ipcarg_t r0,r1; |
79 | 79 | ||
80 | for (i = 0; i < count; i++) |
80 | for (i = 0; i < count; i++) |
81 | send_call(streams[1].phone, CONSOLE_PUTCHAR, ((const char *)buf)[i]); |
81 | async_msg(streams[1].phone, CONSOLE_PUTCHAR, ((const char *)buf)[i]); |
82 | 82 | ||
83 | return count; |
83 | return count; |
84 | } |
84 | } |
85 | 85 | ||
86 | 86 | ||
87 | 87 | ||
88 | static stream_t open_stdin(void) |
88 | static stream_t open_stdin(void) |
89 | { |
89 | { |
90 | stream_t stream; |
90 | stream_t stream; |
91 | int phoneid; |
91 | int phoneid; |
92 | int res; |
92 | int res; |
93 | 93 | ||
94 | if (console_phone < 0) { |
94 | if (console_phone < 0) { |
95 | while ((console_phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0)) < 0) { |
95 | while ((console_phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0)) < 0) { |
96 | usleep(10000); |
96 | usleep(10000); |
97 | } |
97 | } |
98 | } |
98 | } |
99 | 99 | ||
100 | stream.r = read_stdin; |
100 | stream.r = read_stdin; |
101 | stream.param = 0; |
101 | stream.param = 0; |
102 | stream.phone = console_phone; |
102 | stream.phone = console_phone; |
103 | 103 | ||
104 | return stream; |
104 | return stream; |
105 | } |
105 | } |
106 | 106 | ||
107 | static stream_t open_stdout(void) |
107 | static stream_t open_stdout(void) |
108 | { |
108 | { |
109 | stream_t stream; |
109 | stream_t stream; |
110 | int res; |
110 | int res; |
111 | 111 | ||
112 | if (console_phone < 0) { |
112 | if (console_phone < 0) { |
113 | 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) { |
114 | usleep(10000); |
114 | usleep(10000); |
115 | } |
115 | } |
116 | } |
116 | } |
117 | 117 | ||
118 | stream.w = write_stdout; |
118 | stream.w = write_stdout; |
119 | stream.phone = console_phone; |
119 | stream.phone = console_phone; |
120 | stream.param = 0; |
120 | stream.param = 0; |
121 | return stream; |
121 | return stream; |
122 | } |
122 | } |
123 | 123 | ||
124 | static ssize_t write_null(void *param, const void *buf, size_t count) |
124 | static ssize_t write_null(void *param, const void *buf, size_t count) |
125 | { |
125 | { |
126 | return count; |
126 | return count; |
127 | } |
127 | } |
128 | 128 | ||
129 | 129 | ||
130 | fd_t open(const char *fname, int flags) |
130 | fd_t open(const char *fname, int flags) |
131 | { |
131 | { |
132 | int c = 0; |
132 | int c = 0; |
133 | 133 | ||
134 | while (((streams[c].w) || (streams[c].r)) && (c < FDS)) |
134 | while (((streams[c].w) || (streams[c].r)) && (c < FDS)) |
135 | c++; |
135 | c++; |
136 | if (c == FDS) |
136 | if (c == FDS) |
137 | return EMFILE; |
137 | return EMFILE; |
138 | 138 | ||
139 | if (!strcmp(fname, "stdin")) { |
139 | if (!strcmp(fname, "stdin")) { |
140 | streams[c] = open_stdin(); |
140 | streams[c] = open_stdin(); |
141 | return c; |
141 | return c; |
142 | } |
142 | } |
143 | 143 | ||
144 | if (!strcmp(fname, "stdout")) { |
144 | if (!strcmp(fname, "stdout")) { |
145 | streams[c] = open_stdout(); |
145 | streams[c] = open_stdout(); |
146 | return c; |
146 | return c; |
147 | } |
147 | } |
148 | 148 | ||
149 | if (!strcmp(fname, "stderr")) { |
149 | if (!strcmp(fname, "stderr")) { |
150 | streams[c].w = write_stderr; |
150 | streams[c].w = write_stderr; |
151 | return c; |
151 | return c; |
152 | } |
152 | } |
153 | if (!strcmp(fname, "null")) { |
153 | if (!strcmp(fname, "null")) { |
154 | streams[c].w = write_null; |
154 | streams[c].w = write_null; |
155 | return c; |
155 | return c; |
156 | } |
156 | } |
157 | } |
157 | } |
158 | 158 | ||
159 | 159 | ||
160 | ssize_t write(int fd, const void *buf, size_t count) |
160 | ssize_t write(int fd, const void *buf, size_t count) |
161 | { |
161 | { |
- | 162 | // __SYSCALL3(SYS_IO, 1, (sysarg_t)buf, (sysarg_t) count); |
|
- | 163 | // return count; |
|
162 | if (fd < FDS) |
164 | if (fd < FDS) |
163 | return streams[fd].w(streams[fd].param, buf, count); |
165 | return streams[fd].w(streams[fd].param, buf, count); |
164 | 166 | ||
165 | return 0; |
167 | return 0; |
166 | } |
168 | } |
167 | 169 | ||
168 | ssize_t read(int fd, void *buf, size_t count) |
170 | ssize_t read(int fd, void *buf, size_t count) |
169 | { |
171 | { |
170 | if (fd < FDS) |
172 | if (fd < FDS) |
171 | return streams[fd].r(streams[fd].param, buf, count); |
173 | return streams[fd].r(streams[fd].param, buf, count); |
172 | 174 | ||
173 | return 0; |
175 | return 0; |
174 | } |
176 | } |
175 | 177 | ||
176 | int get_fd_phone(int fd) |
178 | int get_fd_phone(int fd) |
177 | { |
179 | { |
178 | if (fd >= FDS || fd < 0) |
180 | if (fd >= FDS || fd < 0) |
179 | return -1; |
181 | return -1; |
180 | return streams[fd].phone; |
182 | return streams[fd].phone; |
181 | } |
183 | } |
182 | 184 |