Rev 4201 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4201 | Rev 4420 | ||
---|---|---|---|
Line 47... | Line 47... | ||
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) |
- | |
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 | int cons_phone = console_phone_get(false); |
54 | int cons_phone = console_open(false); |
60 | 55 | ||
61 | if (cons_phone >= 0) { |
56 | if (cons_phone >= 0) { |
62 | kbd_event_t ev; |
57 | kbd_event_t ev; |
63 | int rc; |
58 | int rc; |
64 | size_t i = 0; |
59 | size_t i = 0; |
65 | 60 | ||
66 | while (i < count) { |
61 | while (i < count) { |
67 | do { |
62 | do { |
68 | rc = kbd_get_event(&ev); |
63 | rc = kbd_get_event(&ev); |
69 | if (rc < 0) return -1; |
64 | if (rc < 0) return -1; |
70 | } while (ev.c == 0 || ev.type == KE_RELEASE); |
65 | } while (ev.c == 0 || ev.type == KE_RELEASE); |
71 | 66 | ||
72 | ((char *) buf)[i++] = ev.c; |
67 | ((char *) buf)[i++] = ev.c; |
73 | } |
68 | } |
74 | return i; |
69 | return i; |
75 | } else { |
- | |
76 | return -1; |
- | |
77 | } |
- | |
78 | } |
- | |
79 | - | ||
80 | ssize_t write_stdout(const void *buf, size_t count) |
- | |
81 | { |
- | |
82 | int cons_phone = console_phone_get(false); |
- | |
83 | int left, rc; |
- | |
84 | - | ||
85 | if (cons_phone >= 0) { |
- | |
86 | int i; |
- | |
87 | - | ||
88 | left = count; |
- | |
89 | while (left > 0) { |
- | |
90 | rc = console_write(buf, left); |
- | |
91 | if (rc < 0) |
- | |
92 | break; |
- | |
93 | buf += rc; |
- | |
94 | left -= rc; |
- | |
95 | } |
- | |
96 | - | ||
97 | return count; |
- | |
98 | } else |
70 | } else |
99 | return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, count); |
71 | return -1; |
100 | } |
72 | } |
101 | 73 | ||
- | 74 | /** Write a string to klog. */ |
|
102 | int flush_stdout(void) |
75 | int klog_puts(const char *str) |
103 | { |
76 | { |
104 | console_flush(); |
77 | return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) str, str_size(str)); |
105 | return 0; |
- | |
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); |