| 42,79 → 42,45 |
|---|
| #include <ipc/ns.h> |
| #include <ipc/fb.h> |
| #include <ipc/services.h> |
| #include <ipc/console.h> |
| #include <console.h> |
| #include <kbd/kbd.h> |
| #include <unistd.h> |
| #include <async.h> |
| #include <sys/types.h> |
| |
| static int console_phone = -1; |
| |
| ssize_t write_stderr(const void *buf, size_t count) |
| { |
| return count; |
| } |
| |
| ssize_t read_stdin(void *buf, size_t count) |
| { |
| open_console(); |
| if (console_phone >= 0) { |
| ipcarg_t r0, r1; |
| int cons_phone = console_open(false); |
| |
| if (cons_phone >= 0) { |
| kbd_event_t ev; |
| int rc; |
| size_t i = 0; |
| |
| |
| while (i < count) { |
| if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0, &r1) < 0) |
| return -1; |
| ((char *) buf)[i++] = r0; |
| do { |
| rc = kbd_get_event(&ev); |
| if (rc < 0) return -1; |
| } while (ev.c == 0 || ev.type == KE_RELEASE); |
| |
| ((char *) buf)[i++] = ev.c; |
| } |
| return i; |
| } else { |
| } else |
| return -1; |
| } |
| } |
| |
| ssize_t write_stdout(const void *buf, size_t count) |
| /** Write a string to klog. */ |
| int klog_puts(const char *str) |
| { |
| open_console(); |
| if (console_phone >= 0) { |
| int i; |
| |
| for (i = 0; i < count; i++) |
| async_msg_1(console_phone, CONSOLE_PUTCHAR, |
| ((const char *) buf)[i]); |
| |
| return count; |
| } else |
| return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, count); |
| return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) str, str_size(str)); |
| } |
| |
| void open_console(void) |
| { |
| if (console_phone < 0) { |
| int phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0, 0); |
| if (phone >= 0) |
| console_phone = phone; |
| } |
| } |
| |
| void close_console(void) |
| { |
| if (console_phone >= 0) { |
| if (ipc_hangup(console_phone) == 0) { |
| console_phone = -1; |
| } |
| } |
| } |
| |
| void klog_update(void) |
| { |
| (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0); |
| } |
| |
| int get_cons_phone(void) |
| { |
| open_console(); |
| return console_phone; |
| } |
| |
| /** @} |
| */ |