Rev 4317 | Rev 4482 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4317 | Rev 4353 | ||
---|---|---|---|
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 read_stdin(void *buf, size_t count) |
52 | ssize_t read_stdin(void *buf, size_t count) |
53 | { |
53 | { |
54 | int cons_phone = console_open(false); |
54 | int cons_phone = console_open(false); |
55 | 55 | ||
56 | if (cons_phone >= 0) { |
56 | if (cons_phone >= 0) { |
57 | kbd_event_t ev; |
57 | kbd_event_t ev; |
58 | int rc; |
58 | int rc; |
59 | size_t i = 0; |
59 | size_t i = 0; |
60 | 60 | ||
61 | while (i < count) { |
61 | while (i < count) { |
62 | do { |
62 | do { |
63 | rc = kbd_get_event(&ev); |
63 | rc = kbd_get_event(&ev); |
64 | if (rc < 0) return -1; |
64 | if (rc < 0) return -1; |
65 | } while (ev.c == 0 || ev.type == KE_RELEASE); |
65 | } while (ev.c == 0 || ev.type == KE_RELEASE); |
66 | 66 | ||
67 | ((char *) buf)[i++] = ev.c; |
67 | ((char *) buf)[i++] = ev.c; |
68 | } |
68 | } |
69 | return i; |
69 | return i; |
70 | } else |
70 | } else |
71 | return -1; |
71 | return -1; |
72 | } |
72 | } |
73 | 73 | ||
- | 74 | /** Write a string to klog. */ |
|
- | 75 | int klog_puts(const char *str) |
|
- | 76 | { |
|
- | 77 | return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) str, str_size(str)); |
|
- | 78 | } |
|
- | 79 | ||
74 | void klog_update(void) |
80 | void klog_update(void) |
75 | { |
81 | { |
76 | (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0); |
82 | (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0); |
77 | } |
83 | } |
78 | 84 | ||
79 | /** @} |
85 | /** @} |
80 | */ |
86 | */ |
81 | 87 |