| 37,6 → 37,7 |
|---|
| |
| #include <ipc/ipc.h> |
| #include <ipc/services.h> |
| #include <sysinfo.h> |
| #include <stdio.h> |
| #include <unistd.h> |
| #include <stdlib.h> |
| 46,6 → 47,7 |
|---|
| #include <errno.h> |
| #include <libadt/fifo.h> |
| #include <kbd/kbd.h> |
| #include <kbd/keycode.h> |
| |
| #include <kbd.h> |
| #include <key_buffer.h> |
| 57,23 → 59,70 |
|---|
| |
| int cons_connected = 0; |
| int phone2cons = -1; |
| keybuffer_t keybuffer; |
| keybuffer_t keybuffer; |
| |
| /** Currently active modifiers. */ |
| static unsigned mods = KM_NUM_LOCK; |
| |
| /** Currently pressed lock keys. We track these to tackle autorepeat. */ |
| static unsigned lock_keys; |
| |
| int cir_service = 0; |
| int cir_phone = -1; |
| |
| void kbd_push_scancode(int scancode) |
| { |
| printf("scancode: 0x%x\n", scancode); |
| /* printf("scancode: 0x%x\n", scancode);*/ |
| kbd_ctl_parse_scancode(scancode); |
| } |
| |
| #include <kbd/keycode.h> |
| void kbd_push_ev(int type, unsigned int key, unsigned int mods) |
| void kbd_push_ev(int type, unsigned int key) |
| { |
| kbd_event_t ev; |
| unsigned mod_mask; |
| |
| switch (key) { |
| case KC_LCTRL: mod_mask = KM_LCTRL; break; |
| case KC_RCTRL: mod_mask = KM_RCTRL; break; |
| case KC_LSHIFT: mod_mask = KM_LSHIFT; break; |
| case KC_RSHIFT: mod_mask = KM_RSHIFT; break; |
| case KC_LALT: mod_mask = KM_LALT; break; |
| case KC_RALT: mod_mask = KM_RALT; break; |
| default: mod_mask = 0; break; |
| } |
| |
| if (mod_mask != 0) { |
| if (type == KE_PRESS) |
| mods = mods | mod_mask; |
| else |
| mods = mods & ~mod_mask; |
| } |
| |
| switch (key) { |
| case KC_CAPS_LOCK: mod_mask = KM_CAPS_LOCK; break; |
| case KC_NUM_LOCK: mod_mask = KM_NUM_LOCK; break; |
| case KC_SCROLL_LOCK: mod_mask = KM_SCROLL_LOCK; break; |
| default: mod_mask = 0; break; |
| } |
| |
| if (mod_mask != 0) { |
| if (type == KE_PRESS) { |
| /* |
| * Only change lock state on transition from released |
| * to pressed. This prevents autorepeat from messing |
| * up the lock state. |
| */ |
| mods = mods ^ (mod_mask & ~lock_keys); |
| lock_keys = lock_keys | mod_mask; |
| } else { |
| lock_keys = lock_keys & ~mod_mask; |
| } |
| } |
| /* |
| printf("type: %d\n", type); |
| printf("mods: 0x%x\n", mods); |
| printf("keycode: %u\n", key); |
| |
| */ |
| ev.type = type; |
| ev.key = key; |
| ev.mods = mods; |
| 83,27 → 132,6 |
|---|
| async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c); |
| } |
| |
| //static void irq_handler(ipc_callid_t iid, ipc_call_t *call) |
| //{ |
| // kbd_event_t ev; |
| // |
| // kbd_arch_process(&keybuffer, call); |
| // |
| // if (cons_connected && phone2cons != -1) { |
| // /* |
| // * One interrupt can produce more than one event so the result |
| // * is stored in a FIFO. |
| // */ |
| // while (!keybuffer_empty(&keybuffer)) { |
| // if (!keybuffer_pop(&keybuffer, &ev)) |
| // break; |
| // |
| // async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, |
| // ev.mods, ev.c); |
| // } |
| // } |
| //} |
| |
| static void console_connection(ipc_callid_t iid, ipc_call_t *icall) |
| { |
| ipc_callid_t callid; |
| 142,7 → 170,6 |
|---|
| } |
| |
| |
| |
| int main(int argc, char **argv) |
| { |
| printf(NAME ": HelenOS Keyboard service\n"); |
| 149,6 → 176,18 |
|---|
| |
| ipcarg_t phonead; |
| |
| if (sysinfo_value("kbd.cir.fhc") == 1) |
| cir_service = SERVICE_FHC; |
| else if (sysinfo_value("kbd.cir.obio") == 1) |
| cir_service = SERVICE_OBIO; |
| |
| if (cir_service) { |
| while (cir_phone < 0) { |
| cir_phone = ipc_connect_me_to(PHONE_NS, cir_service, |
| 0, 0); |
| } |
| } |
| |
| /* Initialize port driver. */ |
| if (kbd_port_init()) |
| return -1; |