Rev 3425 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3425 | Rev 4377 | ||
---|---|---|---|
Line 40... | Line 40... | ||
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 <console.h> |
46 | #include <console.h> |
- | 47 | #include <kbd/kbd.h> |
|
46 | #include <unistd.h> |
48 | #include <unistd.h> |
47 | #include <async.h> |
49 | #include <async.h> |
48 | #include <sys/types.h> |
50 | #include <sys/types.h> |
49 | 51 | ||
50 | static int console_phone = -1; |
- | |
51 | - | ||
52 | ssize_t write_stderr(const void *buf, size_t count) |
- | |
53 | { |
- | |
54 | return count; |
- | |
55 | } |
- | |
56 | - | ||
57 | ssize_t read_stdin(void *buf, size_t count) |
52 | ssize_t read_stdin(void *buf, size_t count) |
58 | { |
53 | { |
59 | open_console(); |
54 | int cons_phone = console_open(false); |
- | 55 | ||
60 | if (console_phone >= 0) { |
56 | if (cons_phone >= 0) { |
- | 57 | kbd_event_t ev; |
|
61 | ipcarg_t r0, r1; |
58 | int rc; |
62 | size_t i = 0; |
59 | size_t i = 0; |
63 | 60 | ||
64 | while (i < count) { |
61 | while (i < count) { |
- | 62 | do { |
|
65 | if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0, &r1) < 0) |
63 | rc = kbd_get_event(&ev); |
66 | return -1; |
64 | if (rc < 0) return -1; |
- | 65 | } while (ev.c == 0 || ev.type == KE_RELEASE); |
|
- | 66 | ||
67 | ((char *) buf)[i++] = r0; |
67 | ((char *) buf)[i++] = ev.c; |
68 | } |
68 | } |
69 | return i; |
69 | return i; |
70 | } else { |
- | |
71 | return -1; |
- | |
72 | } |
- | |
73 | } |
- | |
74 | - | ||
75 | ssize_t write_stdout(const void *buf, size_t count) |
- | |
76 | { |
- | |
77 | open_console(); |
- | |
78 | if (console_phone >= 0) { |
- | |
79 | int i; |
- | |
80 | - | ||
81 | for (i = 0; i < count; i++) |
- | |
82 | async_msg_1(console_phone, CONSOLE_PUTCHAR, |
- | |
83 | ((const char *) buf)[i]); |
- | |
84 | - | ||
85 | return count; |
- | |
86 | } else |
70 | } else |
87 | return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, count); |
71 | return -1; |
88 | } |
72 | } |
89 | 73 | ||
- | 74 | /** Write a string to klog. */ |
|
90 | void open_console(void) |
75 | int klog_puts(const char *str) |
91 | { |
76 | { |
92 | if (console_phone < 0) { |
- | |
93 | int phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0, 0); |
77 | return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) str, str_size(str)); |
94 | if (phone >= 0) |
- | |
95 | console_phone = phone; |
- | |
96 | } |
- | |
97 | } |
- | |
98 | - | ||
99 | void close_console(void) |
- | |
100 | { |
- | |
101 | if (console_phone >= 0) { |
- | |
102 | if (ipc_hangup(console_phone) == 0) { |
- | |
103 | console_phone = -1; |
- | |
104 | } |
- | |
105 | } |
- | |
106 | } |
78 | } |
107 | 79 | ||
108 | void klog_update(void) |
80 | void klog_update(void) |
109 | { |
81 | { |
110 | (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0); |
82 | (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0); |
111 | } |
83 | } |
112 | 84 | ||
113 | int get_cons_phone(void) |
- | |
114 | { |
- | |
115 | open_console(); |
- | |
116 | return console_phone; |
- | |
117 | } |
- | |
118 | - | ||
119 | /** @} |
85 | /** @} |
120 | */ |
86 | */ |