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