Rev 1499 | Rev 1506 | Go to most recent revision | Only display areas with differences | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1499 | Rev 1504 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright (C) 2006 Josef Cejka |
2 | * Copyright (C) 2006 Josef Cejka |
3 | * All rights reserved. |
3 | * All rights reserved. |
4 | * |
4 | * |
5 | * Redistribution and use in source and binary forms, with or without |
5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions |
6 | * modification, are permitted provided that the following conditions |
7 | * are met: |
7 | * are met: |
8 | * |
8 | * |
9 | * - Redistributions of source code must retain the above copyright |
9 | * - Redistributions of source code must retain the above copyright |
10 | * notice, this list of conditions and the following disclaimer. |
10 | * notice, this list of conditions and the following disclaimer. |
11 | * - Redistributions in binary form must reproduce the above copyright |
11 | * - Redistributions in binary form must reproduce the above copyright |
12 | * notice, this list of conditions and the following disclaimer in the |
12 | * notice, this list of conditions and the following disclaimer in the |
13 | * documentation and/or other materials provided with the distribution. |
13 | * documentation and/or other materials provided with the distribution. |
14 | * - The name of the author may not be used to endorse or promote products |
14 | * - The name of the author may not be used to endorse or promote products |
15 | * derived from this software without specific prior written permission. |
15 | * derived from this software without specific prior written permission. |
16 | * |
16 | * |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
25 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ |
27 | */ |
28 | 28 | ||
29 | 29 | ||
30 | #include <kbd.h> |
30 | #include <kbd.h> |
31 | #include <fb.h> |
31 | #include <fb.h> |
32 | #include <ipc/ipc.h> |
32 | #include <ipc/ipc.h> |
33 | #include <ipc/fb.h> |
33 | #include <ipc/fb.h> |
34 | #include <ipc/services.h> |
34 | #include <ipc/services.h> |
35 | #include <errno.h> |
35 | #include <errno.h> |
36 | #include <key_buffer.h> |
36 | #include <key_buffer.h> |
37 | #include <console.h> |
37 | #include <console.h> |
38 | #include <unistd.h> |
38 | #include <unistd.h> |
39 | #include <async.h> |
39 | #include <async.h> |
40 | #include <libadt/fifo.h> |
40 | #include <libadt/fifo.h> |
41 | #include <screenbuffer.h> |
41 | #include <screenbuffer.h> |
42 | 42 | ||
43 | #define CONSOLE_COUNT 12 |
43 | #define CONSOLE_COUNT 12 |
44 | #define MAX_KEYREQUESTS_BUFFERED 32 |
44 | #define MAX_KEYREQUESTS_BUFFERED 32 |
45 | 45 | ||
46 | #define NAME "CONSOLE" |
46 | #define NAME "CONSOLE" |
47 | 47 | ||
48 | int active_console = 1; |
48 | int active_console = 1; |
49 | 49 | ||
50 | struct { |
50 | struct { |
51 | int phone; /**< Framebuffer phone */ |
51 | int phone; /**< Framebuffer phone */ |
52 | int rows; /**< Framebuffer rows */ |
52 | int rows; /**< Framebuffer rows */ |
53 | int cols; /**< Framebuffer columns */ |
53 | int cols; /**< Framebuffer columns */ |
54 | } fb_info; |
54 | } fb_info; |
55 | 55 | ||
56 | typedef struct { |
56 | typedef struct { |
57 | keybuffer_t keybuffer; |
57 | keybuffer_t keybuffer; |
58 | FIFO_CREATE_STATIC(keyrequests, ipc_callid_t , MAX_KEYREQUESTS_BUFFERED); |
58 | FIFO_CREATE_STATIC(keyrequests, ipc_callid_t , MAX_KEYREQUESTS_BUFFERED); |
59 | int keyrequest_counter; |
59 | int keyrequest_counter; |
60 | int client_phone; |
60 | int client_phone; |
61 | int used; |
61 | int used; |
62 | screenbuffer_t screenbuffer; |
62 | screenbuffer_t screenbuffer; |
63 | } connection_t; |
63 | } connection_t; |
64 | 64 | ||
65 | connection_t connections[CONSOLE_COUNT]; |
65 | connection_t connections[CONSOLE_COUNT]; |
66 | 66 | ||
67 | static int find_free_connection() |
67 | static int find_free_connection() |
68 | { |
68 | { |
69 | int i = 0; |
69 | int i = 0; |
70 | 70 | ||
71 | while (i < CONSOLE_COUNT) { |
71 | while (i < CONSOLE_COUNT) { |
72 | if (connections[i].used == 0) |
72 | if (connections[i].used == 0) |
73 | return i; |
73 | return i; |
74 | ++i; |
74 | ++i; |
75 | } |
75 | } |
76 | return CONSOLE_COUNT; |
76 | return CONSOLE_COUNT; |
77 | } |
77 | } |
78 | 78 | ||
79 | 79 | ||
80 | static int find_connection(int client_phone) |
80 | static int find_connection(int client_phone) |
81 | { |
81 | { |
82 | int i = 0; |
82 | int i = 0; |
83 | 83 | ||
84 | while (i < CONSOLE_COUNT) { |
84 | while (i < CONSOLE_COUNT) { |
85 | if (connections[i].client_phone == client_phone) |
85 | if (connections[i].client_phone == client_phone) |
86 | return i; |
86 | return i; |
87 | ++i; |
87 | ++i; |
88 | } |
88 | } |
89 | return CONSOLE_COUNT; |
89 | return CONSOLE_COUNT; |
90 | } |
90 | } |
91 | 91 | ||
92 | /** Check key and process special keys. |
92 | /** Check key and process special keys. |
93 | * |
93 | * |
94 | * */ |
94 | * */ |
95 | static void write_char(int console, char key) |
95 | static void write_char(int console, char key) |
96 | { |
96 | { |
97 | screenbuffer_t *scr = &(connections[console].screenbuffer); |
97 | screenbuffer_t *scr = &(connections[console].screenbuffer); |
98 | 98 | ||
99 | switch (key) { |
99 | switch (key) { |
100 | case '\n': |
100 | case '\n': |
101 | scr->position_y += 1; |
101 | scr->position_y += 1; |
102 | scr->position_x = 0; |
102 | scr->position_x = 0; |
103 | break; |
103 | break; |
104 | case '\r': |
104 | case '\r': |
105 | break; |
105 | break; |
106 | case '\t': |
106 | case '\t': |
107 | scr->position_x += 8; |
107 | scr->position_x += 8; |
108 | scr->position_x -= scr->position_x % 8; |
108 | scr->position_x -= scr->position_x % 8; |
109 | break; |
109 | break; |
110 | case '\b': |
110 | case '\b': |
111 | if (scr->position_x == 0) |
111 | if (scr->position_x == 0) |
112 | break; |
112 | break; |
113 | 113 | ||
114 | scr->position_x--; |
114 | scr->position_x--; |
115 | 115 | ||
116 | if (console == active_console) { |
116 | if (console == active_console) { |
117 | ipc_call_async_3(fb_info.phone, FB_PUTCHAR, ' ', scr->position_y, scr->position_x, NULL, NULL); |
117 | ipc_call_async_3(fb_info.phone, FB_PUTCHAR, ' ', scr->position_y, scr->position_x, NULL, NULL); |
118 | } |
118 | } |
119 | 119 | ||
120 | screenbuffer_putchar(scr, ' '); |
120 | screenbuffer_putchar(scr, ' '); |
121 | 121 | ||
122 | break; |
122 | break; |
123 | default: |
123 | default: |
124 | if (console == active_console) { |
124 | if (console == active_console) { |
125 | ipc_call_async_3(fb_info.phone, FB_PUTCHAR, key, scr->position_y, scr->position_x, NULL, NULL); |
125 | ipc_call_async_3(fb_info.phone, FB_PUTCHAR, key, scr->position_y, scr->position_x, NULL, NULL); |
126 | } |
126 | } |
127 | 127 | ||
128 | screenbuffer_putchar(scr, key); |
128 | screenbuffer_putchar(scr, key); |
129 | scr->position_x++; |
129 | scr->position_x++; |
130 | } |
130 | } |
131 | 131 | ||
132 | scr->position_y += (scr->position_x >= scr->size_x); |
132 | scr->position_y += (scr->position_x >= scr->size_x); |
133 | 133 | ||
134 | if (scr->position_y >= scr->size_y) { |
134 | if (scr->position_y >= scr->size_y) { |
135 | scr->position_y = scr->size_y - 1; |
135 | scr->position_y = scr->size_y - 1; |
136 | screenbuffer_clear_line(scr, scr->top_line++); |
136 | screenbuffer_clear_line(scr, scr->top_line++); |
137 | ipc_call_async(fb_info.phone, FB_SCROLL, 1, NULL, NULL); |
137 | ipc_call_async(fb_info.phone, FB_SCROLL, 1, NULL, NULL); |
138 | } |
138 | } |
139 | 139 | ||
140 | scr->position_x = scr->position_x % scr->size_x; |
140 | scr->position_x = scr->position_x % scr->size_x; |
- | 141 | ||
141 | scr->position_y = scr->position_y % scr->size_y; |
142 | if (console == active_console) |
142 | ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, scr->position_y, scr->position_x, NULL, NULL); |
143 | ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, scr->position_y, scr->position_x, NULL, NULL); |
143 | 144 | ||
144 | } |
145 | } |
145 | 146 | ||
146 | 147 | ||
147 | /* Handler for keyboard */ |
148 | /* Handler for keyboard */ |
148 | static void keyboard_events(ipc_callid_t iid, ipc_call_t *icall) |
149 | static void keyboard_events(ipc_callid_t iid, ipc_call_t *icall) |
149 | { |
150 | { |
150 | ipc_callid_t callid; |
151 | ipc_callid_t callid; |
151 | ipc_call_t call; |
152 | ipc_call_t call; |
152 | int retval; |
153 | int retval; |
153 | int i, j; |
154 | int i, j; |
154 | char c,d; |
155 | char c,d; |
155 | connection_t *conn; |
156 | connection_t *conn; |
156 | 157 | ||
157 | /* Ignore parameters, the connection is alread opened */ |
158 | /* Ignore parameters, the connection is alread opened */ |
158 | while (1) { |
159 | while (1) { |
159 | callid = async_get_call(&call); |
160 | callid = async_get_call(&call); |
160 | switch (IPC_GET_METHOD(call)) { |
161 | switch (IPC_GET_METHOD(call)) { |
161 | case IPC_M_PHONE_HUNGUP: |
162 | case IPC_M_PHONE_HUNGUP: |
162 | ipc_answer_fast(callid,0,0,0); |
163 | ipc_answer_fast(callid,0,0,0); |
163 | /* TODO: Handle hangup */ |
164 | /* TODO: Handle hangup */ |
164 | return; |
165 | return; |
165 | case KBD_PUSHCHAR: |
166 | case KBD_PUSHCHAR: |
166 | /* got key from keyboard driver */ |
167 | /* got key from keyboard driver */ |
167 | 168 | ||
168 | retval = 0; |
169 | retval = 0; |
169 | c = IPC_GET_ARG1(call); |
170 | c = IPC_GET_ARG1(call); |
170 | /* switch to another virtual console */ |
171 | /* switch to another virtual console */ |
171 | 172 | ||
172 | conn = &connections[active_console]; |
173 | conn = &connections[active_console]; |
173 | // if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) { |
174 | // if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) { |
174 | if ((c >= '1') && (c < '1' + CONSOLE_COUNT)) { |
175 | if ((c >= '1') && (c < '1' + CONSOLE_COUNT)) { |
175 | /*FIXME: draw another console content from buffer */ |
176 | /*FIXME: draw another console content from buffer */ |
176 | if (c - '1' == active_console) |
177 | if (c - '1' == active_console) |
177 | break; |
178 | break; |
178 | active_console = c - '1'; |
179 | active_console = c - '1'; |
179 | conn = &connections[active_console]; |
180 | conn = &connections[active_console]; |
180 | 181 | ||
181 | ipc_call_async(fb_info.phone, FB_CURSOR_VISIBILITY, 0, NULL, NULL); |
182 | ipc_call_async(fb_info.phone, FB_CURSOR_VISIBILITY, 0, NULL, NULL); |
182 | ipc_call_async_2(fb_info.phone, FB_CLEAR, 0, 0, NULL, NULL); |
183 | ipc_call_async_2(fb_info.phone, FB_CLEAR, 0, 0, NULL, NULL); |
183 | 184 | ||
184 | for (i = 0; i < conn->screenbuffer.size_x; i++) |
185 | for (i = 0; i < conn->screenbuffer.size_x; i++) |
185 | for (j = 0; j < conn->screenbuffer.size_y; j++) { |
186 | for (j = 0; j < conn->screenbuffer.size_y; j++) { |
186 | d = get_field_at(&(conn->screenbuffer),i, j)->character; |
187 | d = get_field_at(&(conn->screenbuffer),i, j)->character; |
187 | if (d && d != ' ') |
188 | if (d && d != ' ') |
188 | ipc_call_async_3(fb_info.phone, FB_PUTCHAR, d, j, i, NULL, NULL); |
189 | ipc_call_async_3(fb_info.phone, FB_PUTCHAR, d, j, i, NULL, NULL); |
189 | } |
190 | } |
190 | 191 | ||
191 | ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, conn->screenbuffer.position_y, conn->screenbuffer.position_x, NULL, NULL); |
192 | ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, conn->screenbuffer.position_y, conn->screenbuffer.position_x, NULL, NULL); |
192 | ipc_call_async(fb_info.phone, FB_CURSOR_VISIBILITY, 1, NULL, NULL); |
193 | ipc_call_async(fb_info.phone, FB_CURSOR_VISIBILITY, 1, NULL, NULL); |
193 | 194 | ||
194 | break; |
195 | break; |
195 | } |
196 | } |
196 | 197 | ||
197 | /* if client is awaiting key, send it */ |
198 | /* if client is awaiting key, send it */ |
198 | if (conn->keyrequest_counter > 0) { |
199 | if (conn->keyrequest_counter > 0) { |
199 | conn->keyrequest_counter--; |
200 | conn->keyrequest_counter--; |
200 | ipc_answer_fast(fifo_pop(conn->keyrequests), 0, c, 0); |
201 | ipc_answer_fast(fifo_pop(conn->keyrequests), 0, c, 0); |
201 | break; |
202 | break; |
202 | } |
203 | } |
203 | 204 | ||
204 | /*FIXME: else store key to its buffer */ |
205 | /*FIXME: else store key to its buffer */ |
205 | keybuffer_push(&conn->keybuffer, c); |
206 | keybuffer_push(&conn->keybuffer, c); |
206 | 207 | ||
207 | break; |
208 | break; |
208 | default: |
209 | default: |
209 | retval = ENOENT; |
210 | retval = ENOENT; |
210 | } |
211 | } |
211 | ipc_answer_fast(callid, retval, 0, 0); |
212 | ipc_answer_fast(callid, retval, 0, 0); |
212 | } |
213 | } |
213 | } |
214 | } |
214 | 215 | ||
215 | /** Default thread for new connections */ |
216 | /** Default thread for new connections */ |
216 | void client_connection(ipc_callid_t iid, ipc_call_t *icall) |
217 | void client_connection(ipc_callid_t iid, ipc_call_t *icall) |
217 | { |
218 | { |
218 | ipc_callid_t callid; |
219 | ipc_callid_t callid; |
219 | ipc_call_t call; |
220 | ipc_call_t call; |
220 | int consnum; |
221 | int consnum; |
221 | ipcarg_t arg1; |
222 | ipcarg_t arg1; |
222 | 223 | ||
223 | if ((consnum = find_free_connection()) == CONSOLE_COUNT) { |
224 | if ((consnum = find_free_connection()) == CONSOLE_COUNT) { |
224 | ipc_answer_fast(iid,ELIMIT,0,0); |
225 | ipc_answer_fast(iid,ELIMIT,0,0); |
225 | return; |
226 | return; |
226 | } |
227 | } |
227 | 228 | ||
228 | connections[consnum].used = 1; |
229 | connections[consnum].used = 1; |
229 | connections[consnum].client_phone = IPC_GET_ARG3(call); |
230 | connections[consnum].client_phone = IPC_GET_ARG3(call); |
230 | screenbuffer_clear(&(connections[consnum].screenbuffer)); |
231 | screenbuffer_clear(&(connections[consnum].screenbuffer)); |
231 | 232 | ||
232 | /* Accept the connection */ |
233 | /* Accept the connection */ |
233 | ipc_answer_fast(iid,0,0,0); |
234 | ipc_answer_fast(iid,0,0,0); |
234 | 235 | ||
235 | while (1) { |
236 | while (1) { |
236 | callid = async_get_call(&call); |
237 | callid = async_get_call(&call); |
237 | switch (IPC_GET_METHOD(call)) { |
238 | switch (IPC_GET_METHOD(call)) { |
238 | case IPC_M_PHONE_HUNGUP: |
239 | case IPC_M_PHONE_HUNGUP: |
239 | /* TODO */ |
240 | /* TODO */ |
240 | ipc_answer_fast(callid, 0,0,0); |
241 | ipc_answer_fast(callid, 0,0,0); |
241 | return; |
242 | return; |
242 | case CONSOLE_PUTCHAR: |
243 | case CONSOLE_PUTCHAR: |
243 | write_char(consnum, IPC_GET_ARG1(call)); |
244 | write_char(consnum, IPC_GET_ARG1(call)); |
244 | break; |
245 | break; |
245 | case CONSOLE_CLEAR: |
246 | case CONSOLE_CLEAR: |
246 | /* Send message to fb */ |
247 | /* Send message to fb */ |
247 | if (consnum == active_console) { |
248 | if (consnum == active_console) { |
248 | ipc_call_async_2(fb_info.phone, FB_CLEAR, 0, 0, NULL, NULL); |
249 | ipc_call_async_2(fb_info.phone, FB_CLEAR, 0, 0, NULL, NULL); |
249 | } |
250 | } |
250 | 251 | ||
251 | screenbuffer_clear(&(connections[consnum].screenbuffer)); |
252 | screenbuffer_clear(&(connections[consnum].screenbuffer)); |
252 | 253 | ||
253 | break; |
254 | break; |
254 | case CONSOLE_GOTO: |
255 | case CONSOLE_GOTO: |
255 | 256 | ||
256 | screenbuffer_goto(&(connections[consnum].screenbuffer), IPC_GET_ARG1(call), IPC_GET_ARG2(call)); |
257 | screenbuffer_goto(&(connections[consnum].screenbuffer), IPC_GET_ARG1(call), IPC_GET_ARG2(call)); |
257 | 258 | ||
258 | break; |
259 | break; |
259 | 260 | ||
260 | case CONSOLE_GETCHAR: |
261 | case CONSOLE_GETCHAR: |
261 | if (keybuffer_empty(&(connections[consnum].keybuffer))) { |
262 | if (keybuffer_empty(&(connections[consnum].keybuffer))) { |
262 | /* buffer is empty -> store request */ |
263 | /* buffer is empty -> store request */ |
263 | if (connections[consnum].keyrequest_counter < MAX_KEYREQUESTS_BUFFERED) { |
264 | if (connections[consnum].keyrequest_counter < MAX_KEYREQUESTS_BUFFERED) { |
264 | fifo_push(connections[consnum].keyrequests, callid); |
265 | fifo_push(connections[consnum].keyrequests, callid); |
265 | connections[consnum].keyrequest_counter++; |
266 | connections[consnum].keyrequest_counter++; |
266 | } else { |
267 | } else { |
267 | /* no key available and too many requests => fail */ |
268 | /* no key available and too many requests => fail */ |
268 | ipc_answer_fast(callid, ELIMIT, 0, 0); |
269 | ipc_answer_fast(callid, ELIMIT, 0, 0); |
269 | } |
270 | } |
270 | continue; |
271 | continue; |
271 | }; |
272 | }; |
272 | keybuffer_pop(&(connections[consnum].keybuffer), (char *)&arg1); |
273 | keybuffer_pop(&(connections[consnum].keybuffer), (char *)&arg1); |
273 | 274 | ||
274 | break; |
275 | break; |
275 | } |
276 | } |
276 | ipc_answer_fast(callid, 0, arg1, 0); |
277 | ipc_answer_fast(callid, 0, arg1, 0); |
277 | } |
278 | } |
278 | } |
279 | } |
279 | 280 | ||
280 | int main(int argc, char *argv[]) |
281 | int main(int argc, char *argv[]) |
281 | { |
282 | { |
282 | ipcarg_t phonehash; |
283 | ipcarg_t phonehash; |
283 | int kbd_phone, fb_phone; |
284 | int kbd_phone, fb_phone; |
284 | ipcarg_t retval, arg1 = 0xdead, arg2 = 0xbeef; |
285 | ipcarg_t retval, arg1 = 0xdead, arg2 = 0xbeef; |
285 | int i; |
286 | int i; |
286 | 287 | ||
287 | async_set_client_connection(client_connection); |
288 | async_set_client_connection(client_connection); |
288 | 289 | ||
289 | /* Connect to keyboard driver */ |
290 | /* Connect to keyboard driver */ |
290 | 291 | ||
291 | while ((kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0)) < 0) { |
292 | while ((kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0)) < 0) { |
292 | usleep(10000); |
293 | usleep(10000); |
293 | }; |
294 | }; |
294 | 295 | ||
295 | if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, &phonehash) != 0) { |
296 | if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, &phonehash) != 0) { |
296 | return -1; |
297 | return -1; |
297 | }; |
298 | }; |
298 | async_new_connection(phonehash, 0, NULL, keyboard_events); |
299 | async_new_connection(phonehash, 0, NULL, keyboard_events); |
299 | 300 | ||
300 | /* Connect to framebuffer driver */ |
301 | /* Connect to framebuffer driver */ |
301 | 302 | ||
302 | while ((fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0)) < 0) { |
303 | while ((fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0)) < 0) { |
303 | usleep(10000); |
304 | usleep(10000); |
304 | } |
305 | } |
305 | 306 | ||
306 | ipc_call_sync_2(fb_info.phone, FB_GET_CSIZE, 0, 0, &(fb_info.rows), &(fb_info.cols)); |
307 | ipc_call_sync_2(fb_info.phone, FB_GET_CSIZE, 0, 0, &(fb_info.rows), &(fb_info.cols)); |
307 | ipc_call_sync(fb_info.phone, FB_CURSOR_VISIBILITY, 1, NULL); |
308 | ipc_call_sync(fb_info.phone, FB_CURSOR_VISIBILITY, 1, NULL); |
308 | 309 | ||
309 | /* Init virtual consoles */ |
310 | /* Init virtual consoles */ |
310 | for (i = 0; i < CONSOLE_COUNT; i++) { |
311 | for (i = 0; i < CONSOLE_COUNT; i++) { |
311 | connections[i].used = 0; |
312 | connections[i].used = 0; |
312 | keybuffer_init(&(connections[i].keybuffer)); |
313 | keybuffer_init(&(connections[i].keybuffer)); |
313 | 314 | ||
314 | connections[i].keyrequests.head = connections[i].keyrequests.tail = 0; |
315 | connections[i].keyrequests.head = connections[i].keyrequests.tail = 0; |
315 | connections[i].keyrequests.items = MAX_KEYREQUESTS_BUFFERED; |
316 | connections[i].keyrequests.items = MAX_KEYREQUESTS_BUFFERED; |
316 | connections[i].keyrequest_counter = 0; |
317 | connections[i].keyrequest_counter = 0; |
317 | 318 | ||
318 | if (screenbuffer_init(&(connections[i].screenbuffer), fb_info.cols, fb_info.rows ) == NULL) { |
319 | if (screenbuffer_init(&(connections[i].screenbuffer), fb_info.cols, fb_info.rows ) == NULL) { |
319 | /*FIXME: handle error */ |
320 | /*FIXME: handle error */ |
320 | return -1; |
321 | return -1; |
321 | } |
322 | } |
322 | } |
323 | } |
323 | 324 | ||
- | 325 | ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, 0, 0, NULL, NULL); |
|
324 | 326 | ||
325 | if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, &phonehash) != 0) { |
327 | if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, &phonehash) != 0) { |
326 | return -1; |
328 | return -1; |
327 | }; |
329 | }; |
328 | 330 | ||
329 | async_manager(); |
331 | async_manager(); |
330 | 332 | ||
331 | return 0; |
333 | return 0; |
332 | } |
334 | } |
333 | 335 |