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