Rev 3150 | Rev 4344 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3150 | Rev 4343 | ||
---|---|---|---|
Line 40... | Line 40... | ||
40 | #include <stdio.h> |
40 | #include <stdio.h> |
41 | #include <unistd.h> |
41 | #include <unistd.h> |
42 | #include <stdlib.h> |
42 | #include <stdlib.h> |
43 | #include <stdio.h> |
43 | #include <stdio.h> |
44 | #include <ipc/ns.h> |
44 | #include <ipc/ns.h> |
- | 45 | #include <async.h> |
|
45 | #include <errno.h> |
46 | #include <errno.h> |
46 | #include <arch/kbd.h> |
- | |
47 | #include <kbd.h> |
- | |
48 | #include <libadt/fifo.h> |
47 | #include <libadt/fifo.h> |
- | 48 | #include <kbd/kbd.h> |
|
- | 49 | ||
- | 50 | #include <kbd.h> |
|
49 | #include <key_buffer.h> |
51 | #include <key_buffer.h> |
- | 52 | #include <kbd_port.h> |
|
50 | #include <async.h> |
53 | #include <kbd_ctl.h> |
51 | #include <keys.h> |
54 | #include <layout.h> |
52 | 55 | ||
53 | #define NAME "kbd" |
56 | #define NAME "kbd" |
54 | 57 | ||
55 | int cons_connected = 0; |
58 | int cons_connected = 0; |
56 | int phone2cons = -1; |
59 | int phone2cons = -1; |
57 | keybuffer_t keybuffer; |
60 | keybuffer_t keybuffer; |
58 | 61 | ||
59 | static void irq_handler(ipc_callid_t iid, ipc_call_t *call) |
62 | void kbd_push_scancode(int scancode) |
60 | { |
63 | { |
61 | int chr; |
- | |
62 | - | ||
63 | #ifdef MOUSE_ENABLED |
64 | printf("scancode: 0x%x\n", scancode); |
64 | if (mouse_arch_process(phone2cons, call)) |
65 | kbd_ctl_parse_scancode(scancode); |
65 | return; |
- | |
66 | #endif |
- | |
67 | 66 | } |
|
68 | kbd_arch_process(&keybuffer, call); |
- | |
69 | 67 | ||
70 | if (cons_connected && phone2cons != -1) { |
68 | #include <kbd/keycode.h> |
71 | /* |
- | |
72 | * recode to ASCII - one interrupt can produce more than one |
69 | void kbd_push_ev(int type, unsigned int key, unsigned int mods) |
73 | * code so result is stored in fifo |
- | |
74 | */ |
70 | { |
75 | while (!keybuffer_empty(&keybuffer)) { |
- | |
76 | if (!keybuffer_pop(&keybuffer, (int *)&chr)) |
- | |
77 | break; |
71 | kbd_event_t ev; |
78 | 72 | ||
- | 73 | printf("type: %d\n", type); |
|
- | 74 | printf("mods: 0x%x\n", mods); |
|
- | 75 | printf("keycode: %u\n", key); |
|
- | 76 | ||
- | 77 | ev.type = type; |
|
- | 78 | ev.key = key; |
|
- | 79 | ev.mods = mods; |
|
- | 80 | ||
- | 81 | ev.c = layout_parse_ev(&ev); |
|
- | 82 | ||
- | 83 | async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c); |
|
- | 84 | } |
|
- | 85 | ||
- | 86 | //static void irq_handler(ipc_callid_t iid, ipc_call_t *call) |
|
- | 87 | //{ |
|
- | 88 | // kbd_event_t ev; |
|
- | 89 | // |
|
- | 90 | // kbd_arch_process(&keybuffer, call); |
|
- | 91 | // |
|
- | 92 | // if (cons_connected && phone2cons != -1) { |
|
- | 93 | // /* |
|
- | 94 | // * One interrupt can produce more than one event so the result |
|
- | 95 | // * is stored in a FIFO. |
|
- | 96 | // */ |
|
- | 97 | // while (!keybuffer_empty(&keybuffer)) { |
|
- | 98 | // if (!keybuffer_pop(&keybuffer, &ev)) |
|
- | 99 | // break; |
|
- | 100 | // |
|
79 | async_msg_1(phone2cons, KBD_PUSHCHAR, chr); |
101 | // async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, |
- | 102 | // ev.mods, ev.c); |
|
80 | } |
103 | // } |
81 | } |
104 | // } |
82 | } |
105 | //} |
83 | 106 | ||
84 | static void console_connection(ipc_callid_t iid, ipc_call_t *icall) |
107 | static void console_connection(ipc_callid_t iid, ipc_call_t *icall) |
85 | { |
108 | { |
86 | ipc_callid_t callid; |
109 | ipc_callid_t callid; |
87 | ipc_call_t call; |
110 | ipc_call_t call; |
Line 117... | Line 140... | ||
117 | ipc_answer_0(callid, retval); |
140 | ipc_answer_0(callid, retval); |
118 | } |
141 | } |
119 | } |
142 | } |
120 | 143 | ||
121 | 144 | ||
- | 145 | ||
122 | int main(int argc, char **argv) |
146 | int main(int argc, char **argv) |
123 | { |
147 | { |
124 | printf(NAME ": HelenOS Keyboard service\n"); |
148 | printf(NAME ": HelenOS Keyboard service\n"); |
125 | 149 | ||
126 | ipcarg_t phonead; |
150 | ipcarg_t phonead; |
127 | 151 | ||
128 | /* Initialize arch dependent parts */ |
152 | /* Initialize port driver. */ |
129 | if (kbd_arch_init()) |
153 | if (kbd_port_init()) |
130 | return -1; |
154 | return -1; |
131 | 155 | ||
132 | /* Initialize key buffer */ |
156 | /* Initialize key buffer */ |
133 | keybuffer_init(&keybuffer); |
157 | keybuffer_init(&keybuffer); |
134 | 158 | ||
135 | async_set_client_connection(console_connection); |
159 | async_set_client_connection(console_connection); |
136 | async_set_interrupt_received(irq_handler); |
- | |
- | 160 | ||
137 | /* Register service at nameserver */ |
161 | /* Register service at nameserver. */ |
138 | if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, 0, &phonead) != 0) |
162 | if (ipc_connect_to_me(PHONE_NS, SERVICE_KEYBOARD, 0, 0, &phonead) != 0) |
139 | return -1; |
163 | return -1; |
140 | 164 | ||
141 | printf(NAME ": Accepting connections\n"); |
165 | printf(NAME ": Accepting connections\n"); |
142 | async_manager(); |
166 | async_manager(); |
143 | 167 | ||
144 | /* Never reached */ |
168 | /* Not reached. */ |
145 | return 0; |
169 | return 0; |
146 | } |
170 | } |
147 | 171 | ||
148 | /** |
172 | /** |
149 | * @} |
173 | * @} |