Rev 1459 | Rev 1466 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1459 | Rev 1465 | ||
---|---|---|---|
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 | 40 | ||
41 | //#define CONSOLE_COUNT VFB_CONNECTIONS |
41 | //#define CONSOLE_COUNT VFB_CONNECTIONS |
42 | #define CONSOLE_COUNT 6 |
42 | #define CONSOLE_COUNT 6 |
43 | 43 | ||
44 | #define NAME "CONSOLE" |
44 | #define NAME "CONSOLE" |
45 | 45 | ||
46 | int active_client = 0; |
46 | int active_client = 0; |
47 | 47 | ||
48 | 48 | ||
49 | typedef struct { |
49 | typedef struct { |
50 | keybuffer_t keybuffer; |
50 | keybuffer_t keybuffer; |
51 | int client_phone; |
51 | int client_phone; |
52 | int vfb_number; /* Not used */ |
52 | int vfb_number; /* Not used */ |
53 | int vfb_phone; |
53 | int vfb_phone; |
54 | int used; |
54 | int used; |
55 | } connection_t; |
55 | } connection_t; |
56 | 56 | ||
57 | connection_t connections[CONSOLE_COUNT]; |
57 | connection_t connections[CONSOLE_COUNT]; |
58 | 58 | ||
59 | static int find_free_connection() |
59 | static int find_free_connection() |
60 | { |
60 | { |
61 | int i = 0; |
61 | int i = 0; |
62 | 62 | ||
63 | while (i < CONSOLE_COUNT) { |
63 | while (i < CONSOLE_COUNT) { |
64 | if (connections[i].used == 0) |
64 | if (connections[i].used == 0) |
65 | return i; |
65 | return i; |
66 | ++i; |
66 | ++i; |
67 | } |
67 | } |
68 | return CONSOLE_COUNT; |
68 | return CONSOLE_COUNT; |
69 | } |
69 | } |
70 | 70 | ||
71 | 71 | ||
72 | static int find_connection(int client_phone) |
72 | static int find_connection(int client_phone) |
73 | { |
73 | { |
74 | int i = 0; |
74 | int i = 0; |
75 | 75 | ||
76 | while (i < CONSOLE_COUNT) { |
76 | while (i < CONSOLE_COUNT) { |
77 | if (connections[i].client_phone == client_phone) |
77 | if (connections[i].client_phone == client_phone) |
78 | return i; |
78 | return i; |
79 | ++i; |
79 | ++i; |
80 | } |
80 | } |
81 | return CONSOLE_COUNT; |
81 | return CONSOLE_COUNT; |
82 | } |
82 | } |
83 | 83 | ||
84 | /* Handler for keyboard */ |
84 | /* Handler for keyboard */ |
85 | static void keyboard_events(ipc_callid_t iid, ipc_call_t *icall) |
85 | static void keyboard_events(ipc_callid_t iid, ipc_call_t *icall) |
86 | { |
86 | { |
87 | ipc_callid_t callid; |
87 | ipc_callid_t callid; |
88 | ipc_call_t call; |
88 | ipc_call_t call; |
89 | int retval; |
89 | int retval; |
90 | int i; |
90 | int i; |
91 | 91 | ||
92 | /* Ignore parameters, the connection is alread opened */ |
92 | /* Ignore parameters, the connection is alread opened */ |
93 | while (1) { |
93 | while (1) { |
94 | callid = async_get_call(&call); |
94 | callid = async_get_call(&call); |
95 | switch (IPC_GET_METHOD(call)) { |
95 | switch (IPC_GET_METHOD(call)) { |
96 | case IPC_M_PHONE_HUNGUP: |
96 | case IPC_M_PHONE_HUNGUP: |
97 | ipc_answer_fast(callid,0,0,0); |
97 | ipc_answer_fast(callid,0,0,0); |
98 | /* TODO: Handle hangup */ |
98 | /* TODO: Handle hangup */ |
99 | return; |
99 | return; |
100 | case KBD_PUSHCHAR: |
100 | case KBD_PUSHCHAR: |
101 | /* got key from keyboard driver */ |
101 | /* got key from keyboard driver */ |
- | 102 | ||
102 | /* find active console */ |
103 | /* find active console */ |
- | 104 | ||
103 | /* if client is awaiting key, send it */ |
105 | /* if client is awaiting key, send it */ |
- | 106 | ||
104 | /*FIXME: else store key to its buffer */ |
107 | /*FIXME: else store key to its buffer */ |
105 | retval = 0; |
108 | retval = 0; |
106 | i = IPC_GET_ARG1(call) & 0xff; |
109 | i = IPC_GET_ARG1(call) & 0xff; |
107 | /* switch to another virtual console */ |
110 | /* switch to another virtual console */ |
108 | if ((i >= KBD_KEY_F1) && (i < KBD_KEY_F1 + CONSOLE_COUNT)) { |
111 | if ((i >= KBD_KEY_F1) && (i < KBD_KEY_F1 + CONSOLE_COUNT)) { |
109 | active_client = i - KBD_KEY_F1; |
112 | active_client = i - KBD_KEY_F1; |
110 | break; |
113 | break; |
111 | } |
114 | } |
112 | keybuffer_push(&(connections[active_client].keybuffer), i); |
115 | keybuffer_push(&(connections[active_client].keybuffer), i); |
113 | /* Send it to first FB, DEBUG */ |
116 | /* Send it to first FB, DEBUG */ |
114 | // ipc_call_async_2(connections[0].vfb_phone, FB_PUTCHAR, 0, IPC_GET_ARG1(call),NULL,NULL); |
117 | // ipc_call_async_2(connections[0].vfb_phone, FB_PUTCHAR, 0, IPC_GET_ARG1(call),NULL,NULL); |
115 | ipc_call_sync_2(connections[0].vfb_phone, FB_PUTCHAR, 0, IPC_GET_ARG1(call),NULL,NULL); |
118 | // ipc_call_sync_2(connections[0].vfb_phone, FB_PUTCHAR, 0, IPC_GET_ARG1(call),NULL,NULL); |
116 | 119 | ||
117 | break; |
120 | break; |
118 | default: |
121 | default: |
119 | retval = ENOENT; |
122 | retval = ENOENT; |
120 | } |
123 | } |
121 | ipc_answer_fast(callid, retval, 0, 0); |
124 | ipc_answer_fast(callid, retval, 0, 0); |
122 | } |
125 | } |
123 | } |
126 | } |
124 | 127 | ||
125 | /** Default thread for new connections */ |
128 | /** Default thread for new connections */ |
126 | void client_connection(ipc_callid_t iid, ipc_call_t *icall) |
129 | void client_connection(ipc_callid_t iid, ipc_call_t *icall) |
127 | { |
130 | { |
128 | ipc_callid_t callid; |
131 | ipc_callid_t callid; |
129 | ipc_call_t call; |
132 | ipc_call_t call; |
130 | int consnum; |
133 | int consnum; |
131 | ipcarg_t arg1; |
134 | ipcarg_t arg1; |
132 | 135 | ||
133 | if ((consnum = find_free_connection()) == CONSOLE_COUNT) { |
136 | if ((consnum = find_free_connection()) == CONSOLE_COUNT) { |
134 | ipc_answer_fast(iid,ELIMIT,0,0); |
137 | ipc_answer_fast(iid,ELIMIT,0,0); |
135 | return; |
138 | return; |
136 | } |
139 | } |
137 | connections[consnum].used = 1; |
140 | connections[consnum].used = 1; |
138 | connections[consnum].client_phone = IPC_GET_ARG3(call); |
141 | connections[consnum].client_phone = IPC_GET_ARG3(call); |
139 | 142 | ||
140 | /* Accept the connection */ |
143 | /* Accept the connection */ |
141 | ipc_answer_fast(iid,0,0,0); |
144 | ipc_answer_fast(iid,0,0,0); |
142 | 145 | ||
143 | while (1) { |
146 | while (1) { |
144 | callid = async_get_call(&call); |
147 | callid = async_get_call(&call); |
145 | switch (IPC_GET_METHOD(call)) { |
148 | switch (IPC_GET_METHOD(call)) { |
146 | case IPC_M_PHONE_HUNGUP: |
149 | case IPC_M_PHONE_HUNGUP: |
147 | /* TODO */ |
150 | /* TODO */ |
148 | ipc_answer_fast(callid, 0,0,0); |
151 | ipc_answer_fast(callid, 0,0,0); |
149 | return; |
152 | return; |
150 | case CONSOLE_PUTCHAR: |
153 | case CONSOLE_PUTCHAR: |
151 | /* TODO: send message to fb */ |
154 | /* Send message to fb */ |
152 | ipc_call_async_2(connections[consnum].vfb_phone, FB_PUTCHAR, IPC_GET_ARG1(call), IPC_GET_ARG2(call), NULL, NULL); |
155 | ipc_call_async_2(connections[consnum].vfb_phone, FB_PUTCHAR, IPC_GET_ARG1(call), IPC_GET_ARG2(call), NULL, NULL); |
153 | break; |
156 | break; |
154 | case CONSOLE_GETCHAR: |
157 | case CONSOLE_GETCHAR: |
- | 158 | /* FIXME: Only temporary solution until request storage will be created */ |
|
155 | /* FIXME: */ |
159 | |
156 | if (!keybuffer_pop(&(connections[active_client].keybuffer), (char *)&arg1)) { |
160 | while (!keybuffer_pop(&(connections[active_client].keybuffer), (char *)&arg1)) { |
157 | /* FIXME: buffer empty -> store request */ |
161 | /* FIXME: buffer empty -> store request */ |
158 | arg1 = 'X'; /* Only temporary */ |
162 | usleep(10000); |
159 | }; |
163 | }; |
160 | //ipc_call_async_2(connections[active_client].vfb_phone, FB_PUTCHAR, ' ', arg1, NULL, (void *)NULL); |
- | |
- | 164 | ||
161 | break; |
165 | break; |
162 | } |
166 | } |
163 | ipc_answer_fast(callid, 0,0,0); |
167 | ipc_answer_fast(callid, 0, arg1, 0); |
164 | } |
168 | } |
165 | } |
169 | } |
166 | 170 | ||
167 | int main(int argc, char *argv[]) |
171 | int main(int argc, char *argv[]) |
168 | { |
172 | { |
169 | ipcarg_t phonehash; |
173 | ipcarg_t phonehash; |
170 | int kbd_phone, fb_phone; |
174 | int kbd_phone, fb_phone; |
171 | ipcarg_t retval, arg1 = 0xdead, arg2 = 0xbeef; |
175 | ipcarg_t retval, arg1 = 0xdead, arg2 = 0xbeef; |
172 | int i; |
176 | int i; |
173 | 177 | ||
174 | /* Connect to keyboard driver */ |
178 | /* Connect to keyboard driver */ |
175 | 179 | ||
176 | while ((kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0)) < 0) { |
180 | while ((kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0)) < 0) { |
177 | usleep(10000); |
181 | usleep(10000); |
178 | }; |
182 | }; |
179 | 183 | ||
180 | if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, &phonehash) != 0) { |
184 | if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, &phonehash) != 0) { |
181 | return -1; |
185 | return -1; |
182 | }; |
186 | }; |
183 | async_new_connection(phonehash, 0, NULL, keyboard_events); |
187 | async_new_connection(phonehash, 0, NULL, keyboard_events); |
184 | 188 | ||
185 | /* Connect to framebuffer driver */ |
189 | /* Connect to framebuffer driver */ |
186 | 190 | ||
187 | for (i = 0; i < CONSOLE_COUNT; i++) { |
191 | for (i = 0; i < CONSOLE_COUNT; i++) { |
188 | connections[i].used = 0; |
192 | connections[i].used = 0; |
189 | keybuffer_init(&(connections[i].keybuffer)); |
193 | keybuffer_init(&(connections[i].keybuffer)); |
190 | /* TODO: init key_buffer */ |
194 | /* TODO: init key_buffer */ |
191 | while ((connections[i].vfb_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0)) < 0) { |
195 | while ((connections[i].vfb_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0)) < 0) { |
192 | 196 | usleep(10000); |
|
193 | ipc_call_async_2(connections[i].vfb_phone, FB_PUTCHAR, 'a', 'b', NULL, (void *)NULL); |
197 | //ipc_call_async_2(connections[i].vfb_phone, FB_PUTCHAR, 'a', 'b', NULL, (void *)NULL); |
194 | } |
198 | } |
195 | } |
199 | } |
196 | 200 | ||
197 | if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, &phonehash) != 0) { |
201 | if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, &phonehash) != 0) { |
198 | return -1; |
202 | return -1; |
199 | }; |
203 | }; |
200 | 204 | ||
201 | async_manager(); |
205 | async_manager(); |
202 | 206 | ||
203 | return 0; |
207 | return 0; |
204 | } |
208 | } |
205 | 209 |