Rev 4156 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4156 | Rev 4201 | ||
---|---|---|---|
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 <ipc/console.h> |
45 | #include <ipc/console.h> |
46 | #include <console.h> |
46 | #include <console.h> |
47 | #include <kbd/kbd.h> |
47 | #include <kbd/kbd.h> |
48 | #include <unistd.h> |
48 | #include <unistd.h> |
49 | #include <async.h> |
49 | #include <async.h> |
50 | #include <sys/types.h> |
50 | #include <sys/types.h> |
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 | int cons_phone = console_phone_get(); |
59 | int cons_phone = console_phone_get(false); |
60 | 60 | ||
61 | if (cons_phone >= 0) { |
61 | if (cons_phone >= 0) { |
62 | kbd_event_t ev; |
62 | kbd_event_t ev; |
63 | int rc; |
63 | int rc; |
64 | size_t i = 0; |
64 | size_t i = 0; |
65 | 65 | ||
66 | while (i < count) { |
66 | while (i < count) { |
67 | do { |
67 | do { |
68 | rc = kbd_get_event(&ev); |
68 | rc = kbd_get_event(&ev); |
69 | if (rc < 0) return -1; |
69 | if (rc < 0) return -1; |
70 | } while (ev.c == 0 || ev.type == KE_RELEASE); |
70 | } while (ev.c == 0 || ev.type == KE_RELEASE); |
71 | 71 | ||
72 | ((char *) buf)[i++] = ev.c; |
72 | ((char *) buf)[i++] = ev.c; |
73 | } |
73 | } |
74 | return i; |
74 | return i; |
75 | } else { |
75 | } else { |
76 | return -1; |
76 | return -1; |
77 | } |
77 | } |
78 | } |
78 | } |
79 | 79 | ||
80 | ssize_t write_stdout(const void *buf, size_t count) |
80 | ssize_t write_stdout(const void *buf, size_t count) |
81 | { |
81 | { |
82 | int cons_phone = console_phone_get(); |
82 | int cons_phone = console_phone_get(false); |
- | 83 | int left, rc; |
|
83 | 84 | ||
84 | if (cons_phone >= 0) { |
85 | if (cons_phone >= 0) { |
85 | int i; |
86 | int i; |
86 | 87 | ||
87 | for (i = 0; i < count; i++) |
88 | left = count; |
- | 89 | while (left > 0) { |
|
88 | console_putchar(((const char *) buf)[i]); |
90 | rc = console_write(buf, left); |
- | 91 | if (rc < 0) |
|
- | 92 | break; |
|
- | 93 | buf += rc; |
|
- | 94 | left -= rc; |
|
- | 95 | } |
|
89 | 96 | ||
90 | return count; |
97 | return count; |
91 | } else |
98 | } else |
92 | return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, count); |
99 | return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, count); |
93 | } |
100 | } |
- | 101 | ||
- | 102 | int flush_stdout(void) |
|
- | 103 | { |
|
- | 104 | console_flush(); |
|
- | 105 | return 0; |
|
- | 106 | } |
|
94 | 107 | ||
95 | void klog_update(void) |
108 | void klog_update(void) |
96 | { |
109 | { |
97 | (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0); |
110 | (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0); |
98 | } |
111 | } |
99 | 112 | ||
100 | /** @} |
113 | /** @} |
101 | */ |
114 | */ |
102 | 115 |