Rev 2787 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2787 | Rev 3424 | ||
---|---|---|---|
Line 54... | Line 54... | ||
54 | return count; |
54 | return count; |
55 | } |
55 | } |
56 | 56 | ||
57 | ssize_t read_stdin(void *buf, size_t count) |
57 | ssize_t read_stdin(void *buf, size_t count) |
58 | { |
58 | { |
- | 59 | open_console(); |
|
- | 60 | if (console_phone >= 0) { |
|
59 | ipcarg_t r0, r1; |
61 | ipcarg_t r0, r1; |
60 | size_t i = 0; |
62 | size_t i = 0; |
61 | 63 | ||
62 | while (i < count) { |
64 | while (i < count) { |
63 | if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0, |
65 | if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0, &r1) < 0) |
64 | &r1) < 0) { |
- | |
65 | return -1; |
66 | return -1; |
66 | } |
- | |
67 | ((char *) buf)[i++] = r0; |
67 | ((char *) buf)[i++] = r0; |
68 | } |
68 | } |
69 | return i; |
69 | return i; |
- | 70 | } else { |
|
- | 71 | return -1; |
|
- | 72 | } |
|
70 | } |
73 | } |
71 | 74 | ||
72 | ssize_t write_stdout(const void *buf, size_t count) |
75 | ssize_t write_stdout(const void *buf, size_t count) |
73 | { |
76 | { |
- | 77 | open_console(); |
|
- | 78 | if (console_phone >= 0) { |
|
74 | int i; |
79 | int i; |
75 | 80 | ||
76 | for (i = 0; i < count; i++) |
81 | for (i = 0; i < count; i++) |
77 | async_msg_1(console_phone, CONSOLE_PUTCHAR, |
82 | async_msg_1(console_phone, CONSOLE_PUTCHAR, |
78 | ((const char *) buf)[i]); |
83 | ((const char *) buf)[i]); |
79 | 84 | ||
80 | return count; |
85 | return count; |
- | 86 | } else |
|
- | 87 | return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, count); |
|
81 | } |
88 | } |
82 | 89 | ||
83 | void open_stdin(void) |
90 | void open_console(void) |
84 | { |
91 | { |
85 | if (console_phone < 0) { |
92 | if (console_phone < 0) { |
86 | while ((console_phone = ipc_connect_me_to(PHONE_NS, |
93 | int phone = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0, 0); |
87 | SERVICE_CONSOLE, 0, 0)) < 0) { |
94 | if (phone >= 0) |
88 | usleep(10000); |
95 | console_phone = phone; |
89 | } |
- | |
90 | } |
96 | } |
91 | } |
97 | } |
92 | 98 | ||
93 | void open_stdout(void) |
99 | void klog_update(void) |
94 | { |
100 | { |
95 | if (console_phone < 0) { |
- | |
96 | while ((console_phone = ipc_connect_me_to(PHONE_NS, |
- | |
97 | SERVICE_CONSOLE, 0, 0)) < 0) { |
101 | (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0); |
98 | usleep(10000); |
- | |
99 | } |
- | |
100 | } |
- | |
101 | } |
102 | } |
102 | 103 | ||
103 | int get_cons_phone(void) |
104 | int get_cons_phone(void) |
104 | { |
105 | { |
- | 106 | open_console(); |
|
105 | return console_phone; |
107 | return console_phone; |
106 | } |
108 | } |
107 | 109 | ||
108 | /** @} |
110 | /** @} |
109 | */ |
111 | */ |