Rev 2787 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2787 | Rev 3424 | ||
---|---|---|---|
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 | /** @addtogroup libc |
30 | /** @addtogroup libc |
31 | * @{ |
31 | * @{ |
32 | */ |
32 | */ |
33 | /** @file |
33 | /** @file |
34 | */ |
34 | */ |
35 | 35 | ||
36 | #include <io/io.h> |
36 | #include <io/io.h> |
37 | #include <io/stream.h> |
37 | #include <io/stream.h> |
38 | #include <string.h> |
38 | #include <string.h> |
39 | #include <malloc.h> |
39 | #include <malloc.h> |
40 | #include <libc.h> |
40 | #include <libc.h> |
41 | #include <ipc/ipc.h> |
41 | #include <ipc/ipc.h> |
42 | #include <ipc/ns.h> |
42 | #include <ipc/ns.h> |
43 | #include <ipc/fb.h> |
43 | #include <ipc/fb.h> |
44 | #include <ipc/services.h> |
44 | #include <ipc/services.h> |
45 | #include <console.h> |
45 | #include <console.h> |
46 | #include <unistd.h> |
46 | #include <unistd.h> |
47 | #include <async.h> |
47 | #include <async.h> |
48 | #include <sys/types.h> |
48 | #include <sys/types.h> |
49 | 49 | ||
50 | static int console_phone = -1; |
50 | static int console_phone = -1; |
51 | 51 | ||
52 | ssize_t write_stderr(const void *buf, size_t count) |
52 | ssize_t write_stderr(const void *buf, size_t count) |
53 | { |
53 | { |
54 | return count; |
54 | return count; |
55 | } |
55 | } |
56 | 56 | ||
57 | ssize_t read_stdin(void *buf, size_t count) |
57 | ssize_t read_stdin(void *buf, size_t count) |
58 | { |
58 | { |
- | 59 | open_console(); |
|
- | 60 | if (console_phone >= 0) { |
|
59 | ipcarg_t r0, r1; |
61 | ipcarg_t r0, r1; |
60 | size_t i = 0; |
62 | size_t i = 0; |
61 | 63 | ||
62 | while (i < count) { |
64 | while (i < count) { |
63 | if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0, |
65 | if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0, &r1) < 0) |
64 | &r1) < 0) { |
- | |
65 | return -1; |
66 | return -1; |
- | 67 | ((char *) buf)[i++] = r0; |
|
66 | } |
68 | } |
- | 69 | return i; |
|
- | 70 | } else { |
|
67 | ((char *) buf)[i++] = r0; |
71 | return -1; |
68 | } |
72 | } |
69 | return i; |
- | |
70 | } |
73 | } |
71 | 74 | ||
72 | ssize_t write_stdout(const void *buf, size_t count) |
75 | ssize_t write_stdout(const void *buf, size_t count) |
73 | { |
76 | { |
74 | int i; |
- | |
75 | - | ||
76 | for (i = 0; i < count; i++) |
77 | open_console(); |
77 | async_msg_1(console_phone, CONSOLE_PUTCHAR, |
78 | if (console_phone >= 0) { |
78 | ((const char *) buf)[i]); |
79 | int i; |
79 | 80 | ||
- | 81 | for (i = 0; i < count; i++) |
|
- | 82 | async_msg_1(console_phone, CONSOLE_PUTCHAR, |
|
- | 83 | ((const char *) buf)[i]); |
|
- | 84 | ||
80 | return count; |
85 | return count; |
- | 86 | } else |
|
- | 87 | return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, count); |
|
81 | } |
88 | } |
82 | 89 | ||
83 | void open_stdin(void) |
90 | void open_console(void) |
84 | { |
91 | { |
85 | if (console_phone < 0) { |
92 | if (console_phone < 0) { |
86 | while ((console_phone = ipc_connect_me_to(PHONE_NS, |
93 | int phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0, 0); |
87 | SERVICE_CONSOLE, 0, 0)) < 0) { |
94 | if (phone >= 0) |
88 | usleep(10000); |
95 | console_phone = phone; |
89 | } |
- | |
90 | } |
96 | } |
91 | } |
97 | } |
92 | 98 | ||
93 | void open_stdout(void) |
99 | void klog_update(void) |
94 | { |
100 | { |
95 | if (console_phone < 0) { |
- | |
96 | while ((console_phone = ipc_connect_me_to(PHONE_NS, |
- | |
97 | SERVICE_CONSOLE, 0, 0)) < 0) { |
101 | (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0); |
98 | usleep(10000); |
- | |
99 | } |
- | |
100 | } |
- | |
101 | } |
102 | } |
102 | 103 | ||
103 | int get_cons_phone(void) |
104 | int get_cons_phone(void) |
104 | { |
105 | { |
- | 106 | open_console(); |
|
105 | return console_phone; |
107 | return console_phone; |
106 | } |
108 | } |
107 | 109 | ||
108 | /** @} |
110 | /** @} |
109 | */ |
111 | */ |
110 | 112 |