Rev 4293 | Rev 4482 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4293 | Rev 4317 | ||
---|---|---|---|
Line 32... | Line 32... | ||
32 | * @{ |
32 | * @{ |
33 | */ |
33 | */ |
34 | /** @file |
34 | /** @file |
35 | */ |
35 | */ |
36 | 36 | ||
- | 37 | #include <libc.h> |
|
37 | #include <async.h> |
38 | #include <async.h> |
38 | #include <io/stream.h> |
39 | #include <io/stream.h> |
39 | #include <ipc/console.h> |
40 | #include <ipc/console.h> |
40 | #include <ipc/services.h> |
41 | #include <ipc/services.h> |
41 | #include <errno.h> |
42 | #include <errno.h> |
Line 54... | Line 55... | ||
54 | static char *cbuffer_end = cbuffer + CBUFFER_SIZE; |
55 | static char *cbuffer_end = cbuffer + CBUFFER_SIZE; |
55 | 56 | ||
56 | /** Pointer to first available field in cbuffer. */ |
57 | /** Pointer to first available field in cbuffer. */ |
57 | static char *cbp = cbuffer; |
58 | static char *cbp = cbuffer; |
58 | 59 | ||
59 | static ssize_t cons_write(const char *buf, size_t nbyte); |
- | |
60 | static void cons_putchar(wchar_t c); |
- | |
61 | 60 | ||
62 | static void cbuffer_flush(void); |
61 | /** Write one character to the console via IPC. */ |
63 | static void cbuffer_drain(void); |
- | |
64 | static inline void cbuffer_putc(int c); |
62 | static void cons_putchar(wchar_t c) |
65 | - | ||
66 | - | ||
67 | void console_open(bool blocking) |
- | |
68 | { |
63 | { |
69 | if (console_phone < 0) { |
64 | console_wait(); |
70 | int phone; |
- | |
71 | if (blocking) { |
- | |
72 | phone = ipc_connect_me_to_blocking(PHONE_NS, |
- | |
73 | SERVICE_CONSOLE, 0, 0); |
- | |
74 | } else { |
- | |
75 | phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0, |
- | |
76 | 0); |
- | |
77 | } |
- | |
78 | if (phone >= 0) |
- | |
79 | console_phone = phone; |
65 | async_msg_1(console_phone, CONSOLE_PUTCHAR, c); |
80 | } |
- | |
81 | } |
66 | } |
82 | 67 | ||
- | 68 | /** Write characters to the console via IPC or to klog */ |
|
83 | void console_close(void) |
69 | static ssize_t cons_write(const char *buf, size_t size) |
84 | { |
70 | { |
85 | if (console_phone >= 0) { |
- | |
86 | if (ipc_hangup(console_phone) == 0) { |
- | |
87 | console_phone = -1; |
71 | console_open(false); |
88 | } |
- | |
89 | } |
- | |
90 | } |
- | |
91 | 72 | ||
92 | int console_phone_get(bool blocking) |
- | |
93 | { |
- | |
94 | if (console_phone < 0) |
73 | if (console_phone >= 0) { |
95 | console_open(blocking); |
- | |
96 | - | ||
97 | return console_phone; |
- | |
98 | } |
- | |
99 | - | ||
100 | void console_wait(void) |
- | |
101 | { |
- | |
102 | while (console_phone < 0) |
- | |
103 | console_open(true); |
74 | async_serialize_start(); |
104 | } |
- | |
105 | 75 | ||
106 | void console_clear(void) |
76 | ipc_call_t answer; |
107 | { |
- | |
108 | int cons_phone = console_phone_get(true); |
77 | aid_t req = async_send_0(console_phone, CONSOLE_WRITE, &answer); |
- | 78 | ipcarg_t rc = ipc_data_write_start(console_phone, (void *) buf, size); |
|
109 | 79 | ||
110 | cbuffer_drain(); |
80 | if (rc != EOK) { |
111 | async_msg_0(cons_phone, CONSOLE_CLEAR); |
81 | async_wait_for(req, NULL); |
- | 82 | async_serialize_end(); |
|
- | 83 | return (ssize_t) rc; |
|
112 | } |
84 | } |
113 | 85 | ||
114 | void console_goto(int row, int col) |
86 | async_wait_for(req, &rc); |
115 | { |
- | |
116 | int cons_phone = console_phone_get(true); |
- | |
117 | - | ||
118 | cbuffer_flush(); |
87 | async_serialize_end(); |
119 | async_msg_2(cons_phone, CONSOLE_GOTO, row, col); |
- | |
120 | } |
- | |
121 | 88 | ||
- | 89 | if (rc == EOK) |
|
122 | void console_putchar(wchar_t c) |
90 | return (ssize_t) IPC_GET_ARG1(answer); |
123 | { |
91 | else |
124 | // cbuffer_putc(c); |
92 | return -1; |
125 | cbuffer_flush(); |
93 | } else |
126 | cons_putchar(c); |
94 | return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, size); |
127 | } |
95 | } |
128 | 96 | ||
129 | /** Write all data from output buffer to the console. */ |
97 | /** Write all data from output buffer to the console. */ |
130 | static void cbuffer_flush(void) |
98 | static void cbuffer_flush(void) |
131 | { |
99 | { |
132 | int rc; |
- | |
133 | int len; |
- | |
134 | - | ||
135 | len = cbp - cbuffer; |
100 | size_t len = cbp - cbuffer; |
136 | 101 | ||
137 | while (len > 0) { |
102 | while (len > 0) { |
138 | rc = cons_write(cbuffer, cbp - cbuffer); |
103 | ssize_t rc = cons_write(cbuffer, cbp - cbuffer); |
139 | if (rc < 0) |
104 | if (rc < 0) |
140 | return; |
105 | return; |
141 | 106 | ||
142 | len -= rc; |
107 | len -= rc; |
143 | } |
108 | } |
Line 150... | Line 115... | ||
150 | { |
115 | { |
151 | cbp = cbuffer; |
116 | cbp = cbuffer; |
152 | } |
117 | } |
153 | 118 | ||
154 | /** Write one character to the output buffer. */ |
119 | /** Write one character to the output buffer. */ |
155 | static inline void cbuffer_putc(int c) |
120 | static inline void cbuffer_putc(char c) |
156 | { |
121 | { |
157 | if (cbp == cbuffer_end) |
122 | if (cbp == cbuffer_end) |
158 | cbuffer_flush(); |
123 | cbuffer_flush(); |
159 | 124 | ||
160 | *cbp++ = c; |
125 | *cbp++ = c; |
161 | 126 | ||
162 | if (c == '\n') |
127 | if (c == '\n') |
163 | cbuffer_flush(); |
128 | cbuffer_flush(); |
164 | } |
129 | } |
165 | 130 | ||
166 | /** Write one character to the console via IPC. */ |
- | |
167 | static void cons_putchar(wchar_t c) |
131 | int console_open(bool blocking) |
168 | { |
132 | { |
169 | int cons_phone = console_phone_get(true); |
- | |
170 | async_msg_1(cons_phone, CONSOLE_PUTCHAR, c); |
- | |
171 | } |
- | |
172 | - | ||
173 | /** Write characters to the console via IPC. */ |
- | |
174 | static ssize_t cons_write(const char *buf, size_t nbyte) |
- | |
175 | { |
- | |
176 | int cons_phone = console_phone_get(true); |
133 | if (console_phone < 0) { |
177 | ipcarg_t rc; |
- | |
178 | ipc_call_t answer; |
- | |
179 | aid_t req; |
134 | int phone; |
180 | - | ||
181 | async_serialize_start(); |
- | |
182 | - | ||
183 | req = async_send_0(cons_phone, CONSOLE_WRITE, &answer); |
- | |
184 | rc = ipc_data_write_start(cons_phone, (void *) buf, nbyte); |
- | |
185 | - | ||
186 | if (rc != EOK) { |
- | |
187 | async_wait_for(req, NULL); |
- | |
188 | async_serialize_end(); |
- | |
189 | return (ssize_t) rc; |
- | |
190 | } |
- | |
191 | - | ||
192 | async_wait_for(req, &rc); |
- | |
193 | async_serialize_end(); |
- | |
194 | 135 | ||
195 | if (rc == EOK) |
136 | if (blocking) |
196 | return (ssize_t) IPC_GET_ARG1(answer); |
137 | phone = ipc_connect_me_to_blocking(PHONE_NS, |
- | 138 | SERVICE_CONSOLE, 0, 0); |
|
197 | else |
139 | else |
198 | return -1; |
- | |
199 | } |
- | |
200 | - | ||
201 | /** Write characters to the console. */ |
140 | phone = ipc_connect_me_to(PHONE_NS, |
202 | ssize_t console_write(const char *buf, size_t nbyte) |
141 | SERVICE_CONSOLE, 0, 0); |
203 | { |
- | |
204 | size_t left; |
- | |
205 | - | ||
206 | left = nbyte; |
- | |
207 | 142 | ||
208 | while (left > 0) { |
143 | if (phone >= 0) |
209 | cbuffer_putc(*buf++); |
144 | console_phone = phone; |
210 | --left; |
- | |
211 | } |
145 | } |
212 | 146 | ||
213 | return nbyte; |
147 | return console_phone; |
214 | } |
148 | } |
215 | 149 | ||
216 | /** Write a NULL-terminated string to the console. */ |
- | |
217 | void console_putstr(const char *s) |
150 | void console_close(void) |
218 | { |
151 | { |
219 | size_t len; |
- | |
220 | ssize_t rc; |
- | |
221 | - | ||
222 | len = str_size(s); |
- | |
223 | while (len > 0) { |
152 | if (console_phone >= 0) { |
224 | rc = console_write(s, len); |
153 | if (ipc_hangup(console_phone) == 0) |
225 | if (rc < 0) |
- | |
226 | return; /* Error */ |
- | |
227 | s += rc; |
- | |
228 | len -= rc; |
154 | console_phone = -1; |
229 | } |
155 | } |
230 | } |
156 | } |
231 | 157 | ||
232 | /** Flush all output to the console. */ |
- | |
233 | void console_flush(void) |
158 | void console_wait(void) |
234 | { |
159 | { |
235 | int cons_phone = console_phone_get(false); |
160 | while (console_phone < 0) |
236 | - | ||
237 | cbuffer_flush(); |
161 | console_open(true); |
238 | async_msg_0(cons_phone, CONSOLE_FLUSH); |
- | |
239 | } |
162 | } |
240 | 163 | ||
241 | void console_flush_optional(void) |
164 | void console_clear(void) |
242 | { |
165 | { |
243 | if (console_phone >= 0) |
166 | console_wait(); |
244 | console_flush(); |
167 | cbuffer_drain(); |
- | 168 | async_msg_0(console_phone, CONSOLE_CLEAR); |
|
245 | } |
169 | } |
246 | 170 | ||
247 | int console_get_size(int *rows, int *cols) |
171 | int console_get_size(int *rows, int *cols) |
248 | { |
172 | { |
249 | int cons_phone = console_phone_get(true); |
- | |
250 | ipcarg_t r, c; |
173 | console_wait(); |
251 | int rc; |
- | |
252 | 174 | ||
- | 175 | ipcarg_t r; |
|
- | 176 | ipcarg_t c; |
|
253 | rc = async_req_0_2(cons_phone, CONSOLE_GETSIZE, &r, &c); |
177 | int rc = async_req_0_2(console_phone, CONSOLE_GETSIZE, &r, &c); |
254 | 178 | ||
255 | *rows = (int) r; |
179 | *rows = (int) r; |
256 | *cols = (int) c; |
180 | *cols = (int) c; |
257 | 181 | ||
258 | return rc; |
182 | return rc; |
259 | } |
183 | } |
260 | 184 | ||
261 | void console_set_style(int style) |
185 | void console_set_style(int style) |
262 | { |
186 | { |
263 | int cons_phone = console_phone_get(true); |
187 | console_wait(); |
264 | - | ||
265 | cbuffer_flush(); |
188 | cbuffer_flush(); |
266 | async_msg_1(cons_phone, CONSOLE_SET_STYLE, style); |
189 | async_msg_1(console_phone, CONSOLE_SET_STYLE, style); |
267 | } |
190 | } |
268 | 191 | ||
269 | void console_set_color(int fg_color, int bg_color, int flags) |
192 | void console_set_color(int fg_color, int bg_color, int flags) |
270 | { |
193 | { |
271 | int cons_phone = console_phone_get(true); |
194 | console_wait(); |
272 | - | ||
273 | cbuffer_flush(); |
195 | cbuffer_flush(); |
274 | async_msg_3(cons_phone, CONSOLE_SET_COLOR, fg_color, bg_color, flags); |
196 | async_msg_3(console_phone, CONSOLE_SET_COLOR, fg_color, bg_color, flags); |
275 | } |
197 | } |
276 | 198 | ||
277 | void console_set_rgb_color(int fg_color, int bg_color) |
199 | void console_set_rgb_color(int fg_color, int bg_color) |
278 | { |
200 | { |
279 | int cons_phone = console_phone_get(true); |
201 | console_wait(); |
280 | - | ||
281 | cbuffer_flush(); |
202 | cbuffer_flush(); |
282 | async_msg_2(cons_phone, CONSOLE_SET_RGB_COLOR, fg_color, bg_color); |
203 | async_msg_2(console_phone, CONSOLE_SET_RGB_COLOR, fg_color, bg_color); |
283 | } |
204 | } |
284 | 205 | ||
285 | void console_cursor_visibility(int show) |
206 | void console_cursor_visibility(int show) |
286 | { |
207 | { |
287 | int cons_phone = console_phone_get(true); |
208 | console_wait(); |
288 | - | ||
289 | cbuffer_flush(); |
209 | cbuffer_flush(); |
290 | async_msg_1(cons_phone, CONSOLE_CURSOR_VISIBILITY, show != 0); |
210 | async_msg_1(console_phone, CONSOLE_CURSOR_VISIBILITY, show != 0); |
291 | } |
211 | } |
292 | 212 | ||
293 | void console_kcon_enable(void) |
213 | void console_kcon_enable(void) |
294 | { |
214 | { |
- | 215 | console_wait(); |
|
- | 216 | cbuffer_flush(); |
|
- | 217 | async_msg_0(console_phone, CONSOLE_KCON_ENABLE); |
|
- | 218 | } |
|
- | 219 | ||
- | 220 | void console_goto(int row, int col) |
|
- | 221 | { |
|
- | 222 | console_wait(); |
|
- | 223 | cbuffer_flush(); |
|
- | 224 | async_msg_2(console_phone, CONSOLE_GOTO, row, col); |
|
- | 225 | } |
|
- | 226 | ||
- | 227 | void console_putchar(wchar_t c) |
|
- | 228 | { |
|
- | 229 | console_wait(); |
|
- | 230 | cbuffer_flush(); |
|
- | 231 | cons_putchar(c); |
|
- | 232 | } |
|
- | 233 | ||
- | 234 | /** Write characters to the console. */ |
|
- | 235 | ssize_t console_write(const char *buf, size_t size) |
|
- | 236 | { |
|
- | 237 | size_t left = size; |
|
- | 238 | ||
- | 239 | while (left > 0) { |
|
- | 240 | cbuffer_putc(*buf++); |
|
- | 241 | left--; |
|
- | 242 | } |
|
- | 243 | ||
- | 244 | return size; |
|
- | 245 | } |
|
- | 246 | ||
- | 247 | /** Write a NULL-terminated string to the console. */ |
|
- | 248 | void console_putstr(const char *str) |
|
- | 249 | { |
|
- | 250 | size_t left = str_size(str); |
|
- | 251 | ||
- | 252 | while (left > 0) { |
|
295 | int cons_phone = console_phone_get(true); |
253 | ssize_t rc = console_write(str, left); |
296 | 254 | ||
- | 255 | if (rc < 0) { |
|
- | 256 | /* Error */ |
|
- | 257 | return; |
|
- | 258 | } |
|
- | 259 | ||
- | 260 | str += rc; |
|
- | 261 | left -= rc; |
|
- | 262 | } |
|
- | 263 | } |
|
- | 264 | ||
- | 265 | /** Flush all output to the console or klog. */ |
|
- | 266 | void console_flush(void) |
|
- | 267 | { |
|
297 | cbuffer_flush(); |
268 | cbuffer_flush(); |
- | 269 | if (console_phone >= 0) |
|
298 | async_msg_0(cons_phone, CONSOLE_KCON_ENABLE); |
270 | async_msg_0(console_phone, CONSOLE_FLUSH); |
299 | } |
271 | } |
300 | 272 | ||
301 | /** @} |
273 | /** @} |
302 | */ |
274 | */ |