| /branches/network/uspace/srv/kbd/include/layout.h |
|---|
| 41,6 → 41,7 |
| #include <sys/types.h> |
| typedef struct { |
| void (*reset)(void); |
| wchar_t (*parse_ev)(kbd_event_t *); |
| } layout_op_t; |
| /branches/network/uspace/srv/kbd/include/sun.h |
|---|
| 0,0 → 1,47 |
| /* |
| * Copyright (c) 2009 Martin Decky |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup kbdgen generic |
| * @brief Sun keyboard virtual port driver. |
| * @ingroup kbd |
| * @{ |
| */ |
| /** @file |
| */ |
| #ifndef KBD_SUN_H_ |
| #define KBD_SUN_H_ |
| extern int ns16550_port_init(void); |
| extern int z8530_port_init(void); |
| #endif |
| /** |
| * @} |
| */ |
| /branches/network/uspace/srv/kbd/port/ns16550.c |
|---|
| 35,10 → 35,12 |
| */ |
| #include <ipc/ipc.h> |
| #include <ipc/bus.h> |
| #include <async.h> |
| #include <sysinfo.h> |
| #include <kbd.h> |
| #include <kbd_port.h> |
| #include <sun.h> |
| #include <ddi.h> |
| /* NS16550 registers */ |
| 89,7 → 91,7 |
| static uintptr_t ns16550_physical; |
| static uintptr_t ns16550_kernel; |
| int kbd_port_init(void) |
| int ns16550_port_init(void) |
| { |
| void *vaddr; |
| 100,7 → 102,7 |
| ns16550_kbd.cmds[0].addr = (void *) (ns16550_kernel + LSR_REG); |
| ns16550_kbd.cmds[3].addr = (void *) (ns16550_kernel + RBR_REG); |
| ipc_register_irq(sysinfo_value("kbd.inr"), device_assign_devno(), |
| 0, &ns16550_kbd); |
| sysinfo_value("kbd.inr"), &ns16550_kbd); |
| return pio_enable((void *) ns16550_physical, 8, &vaddr); |
| } |
| 108,6 → 110,10 |
| { |
| int scan_code = IPC_GET_ARG2(*call); |
| kbd_push_scancode(scan_code); |
| if (cir_service) |
| async_msg_1(cir_phone, BUS_CLEAR_INTERRUPT, |
| IPC_GET_METHOD(*call)); |
| } |
| /** |
| /branches/network/uspace/srv/kbd/port/sun.c |
|---|
| 0,0 → 1,66 |
| /* |
| * Copyright (c) 2009 Martin Decky |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup kbd_port |
| * @ingroup kbd |
| * @{ |
| */ |
| /** @file |
| * @brief Sun keyboard virtual port driver. |
| */ |
| #include <kbd.h> |
| #include <kbd_port.h> |
| #include <sun.h> |
| #include <sysinfo.h> |
| /** Sun keyboard virtual port driver. |
| * |
| * This is a virtual port driver which can use |
| * both ns16550_port_init and z8530_port_init |
| * according to the information passed from the |
| * kernel. This is just a temporal hack. |
| * |
| */ |
| int kbd_port_init(void) |
| { |
| if (sysinfo_value("kbd.type.z8530")) { |
| if (z8530_port_init() == 0) |
| return 0; |
| } |
| if (sysinfo_value("kbd.type.ns16550")) { |
| if (ns16550_port_init() == 0) |
| return 0; |
| } |
| return -1; |
| } |
| /** @} |
| */ |
| /branches/network/uspace/srv/kbd/port/z8530.c |
|---|
| 40,6 → 40,7 |
| #include <sysinfo.h> |
| #include <kbd.h> |
| #include <kbd_port.h> |
| #include <sun.h> |
| #include <sys/types.h> |
| #include <ddi.h> |
| 82,7 → 83,7 |
| static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call); |
| int kbd_port_init(void) |
| int z8530_port_init(void) |
| { |
| async_set_interrupt_received(z8530_irq_handler); |
| z8530_cmds[0].addr = (void *) sysinfo_value("kbd.address.kernel") + |
| /branches/network/uspace/srv/kbd/generic/kbd.c |
|---|
| 136,6 → 136,7 |
| if (type == KE_PRESS && (mods & KM_LCTRL) && |
| key == KC_F1) { |
| active_layout = 0; |
| layout[active_layout]->reset(); |
| return; |
| } |
| 142,6 → 143,7 |
| if (type == KE_PRESS && (mods & KM_LCTRL) && |
| key == KC_F2) { |
| active_layout = 1; |
| layout[active_layout]->reset(); |
| return; |
| } |
| 148,6 → 150,7 |
| if (type == KE_PRESS && (mods & KM_LCTRL) && |
| key == KC_F3) { |
| active_layout = 2; |
| layout[active_layout]->reset(); |
| return; |
| } |
| 223,6 → 226,9 |
| /* Initialize controller driver. */ |
| if (kbd_ctl_init() != 0) |
| return -1; |
| /* Initialize (reset) layout. */ |
| layout[active_layout]->reset(); |
| /* Initialize key buffer */ |
| keybuffer_init(&keybuffer); |
| /branches/network/uspace/srv/kbd/Makefile |
|---|
| 59,9 → 59,11 |
| port/i8042.c \ |
| ctl/pc.c |
| endif |
| ifeq ($(UARCH), arm32) |
| GENARCH_SOURCES += \ |
| port/gxemul.c |
| ifeq ($(CONFIG_FB), y) |
| GENARCH_SOURCES += \ |
| ctl/gxe_fb.c |
| 70,29 → 72,35 |
| ctl/stty.c |
| endif |
| endif |
| ifeq ($(UARCH), ia32) |
| GENARCH_SOURCES += \ |
| port/i8042.c \ |
| ctl/pc.c |
| endif |
| ifeq ($(MACHINE), i460GX) |
| GENARCH_SOURCES += \ |
| port/i8042.c \ |
| ctl/pc.c |
| endif |
| ifeq ($(MACHINE), ski) |
| GENARCH_SOURCES += \ |
| port/ski.c \ |
| ctl/stty.c |
| endif |
| ifeq ($(MACHINE), msim) |
| GENARCH_SOURCES += \ |
| port/msim.c \ |
| ctl/stty.c |
| endif |
| ifeq ($(MACHINE), lgxemul) |
| GENARCH_SOURCES += \ |
| port/gxemul.c |
| ifeq ($(CONFIG_FB), y) |
| GENARCH_SOURCES += \ |
| ctl/gxe_fb.c |
| 101,26 → 109,31 |
| ctl/stty.c |
| endif |
| endif |
| ifeq ($(MACHINE), bgxemul) |
| GENARCH_SOURCES += \ |
| port/gxemul.c \ |
| ctl/stty.c |
| endif |
| ifeq ($(UARCH), ppc32) |
| GENARCH_SOURCES += \ |
| port/dummy.c \ |
| ctl/stty.c |
| endif |
| ifeq ($(UARCH), sparc64) |
| ifeq ($(MACHINE),serengeti) |
| GENARCH_SOURCES += \ |
| port/sgcn.c \ |
| ctl/stty.c |
| else |
| GENARCH_SOURCES += \ |
| port/z8530.c \ |
| ctl/sun.c |
| endif |
| ifeq ($(MACHINE),serengeti) |
| GENARCH_SOURCES += \ |
| port/sgcn.c \ |
| ctl/stty.c |
| else |
| GENARCH_SOURCES += \ |
| port/sun.c \ |
| port/z8530.c \ |
| port/ns16550.c \ |
| ctl/sun.c |
| endif |
| endif |
| GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) |
| /branches/network/uspace/srv/kbd/layout/us_qwerty.c |
|---|
| 36,9 → 36,11 |
| #include <kbd/keycode.h> |
| #include <layout.h> |
| static void layout_reset(void); |
| static wchar_t layout_parse_ev(kbd_event_t *ev); |
| layout_op_t us_qwerty_op = { |
| layout_reset, |
| layout_parse_ev |
| }; |
| 197,6 → 199,10 |
| return map[key]; |
| } |
| static void layout_reset(void) |
| { |
| } |
| static wchar_t layout_parse_ev(kbd_event_t *ev) |
| { |
| wchar_t c; |
| /branches/network/uspace/srv/kbd/layout/cz.c |
|---|
| 34,28 → 34,26 |
| #include <kbd.h> |
| #include <kbd/kbd.h> |
| #include <kbd/keycode.h> |
| #include <bool.h> |
| #include <layout.h> |
| static void layout_reset(void); |
| static wchar_t layout_parse_ev(kbd_event_t *ev); |
| enum m_state { |
| ms_start, |
| ms_hacek, |
| ms_carka |
| }; |
| static enum m_state mstate; |
| layout_op_t cz_op = { |
| layout_reset, |
| layout_parse_ev |
| }; |
| static wchar_t map_lcase[] = { |
| [KC_2] = L'ě', |
| [KC_3] = L'š', |
| [KC_4] = L'č', |
| [KC_5] = L'ř', |
| [KC_6] = L'ž', |
| [KC_7] = L'ý', |
| [KC_8] = L'á', |
| [KC_9] = L'í', |
| [KC_0] = L'é', |
| [KC_LBRACKET] = L'ú', |
| [KC_SEMICOLON] = L'ů', |
| [KC_Q] = 'q', |
| [KC_W] = 'w', |
| [KC_E] = 'e', |
| 87,19 → 85,6 |
| }; |
| static wchar_t map_ucase[] = { |
| [KC_2] = L'Ě', |
| [KC_3] = L'Š', |
| [KC_4] = L'Č', |
| [KC_5] = L'Ř', |
| [KC_6] = L'Ž', |
| [KC_7] = L'Ý', |
| [KC_8] = L'Á', |
| [KC_9] = L'Í', |
| [KC_0] = L'É', |
| [KC_LBRACKET] = L'Ú', |
| [KC_SEMICOLON] = L'Ů', |
| [KC_Q] = 'Q', |
| [KC_W] = 'W', |
| [KC_E] = 'E', |
| 172,6 → 157,36 |
| [KC_SLASH] = '_', |
| }; |
| static wchar_t map_ns_nocaps[] = { |
| [KC_2] = L'ě', |
| [KC_3] = L'š', |
| [KC_4] = L'č', |
| [KC_5] = L'ř', |
| [KC_6] = L'ž', |
| [KC_7] = L'ý', |
| [KC_8] = L'á', |
| [KC_9] = L'í', |
| [KC_0] = L'é', |
| [KC_LBRACKET] = L'ú', |
| [KC_SEMICOLON] = L'ů' |
| }; |
| static wchar_t map_ns_caps[] = { |
| [KC_2] = L'Ě', |
| [KC_3] = L'Š', |
| [KC_4] = L'Č', |
| [KC_5] = L'Ř', |
| [KC_6] = L'Ž', |
| [KC_7] = L'Ý', |
| [KC_8] = L'Á', |
| [KC_9] = L'Í', |
| [KC_0] = L'É', |
| [KC_LBRACKET] = L'Ú', |
| [KC_SEMICOLON] = L'Ů' |
| }; |
| static wchar_t map_neutral[] = { |
| [KC_BACKSPACE] = '\b', |
| [KC_TAB] = '\t', |
| 200,6 → 215,56 |
| [KC_NPERIOD] = '.' |
| }; |
| static wchar_t map_hacek_lcase[] = { |
| [KC_E] = L'ě', |
| [KC_R] = L'ř', |
| [KC_T] = L'ť', |
| [KC_Y] = L'ž', |
| [KC_U] = L'ů', |
| [KC_S] = L'š', |
| [KC_D] = L'ď', |
| [KC_C] = L'č', |
| [KC_N] = L'ň' |
| }; |
| static wchar_t map_hacek_ucase[] = { |
| [KC_E] = L'Ě', |
| [KC_R] = L'Ř', |
| [KC_T] = L'Ť', |
| [KC_Y] = L'Ž', |
| [KC_U] = L'Ů', |
| [KC_S] = L'Š', |
| [KC_D] = L'Ď', |
| [KC_C] = L'Č', |
| [KC_N] = L'Ň' |
| }; |
| static wchar_t map_carka_lcase[] = { |
| [KC_E] = L'é', |
| [KC_U] = L'ú', |
| [KC_I] = L'í', |
| [KC_O] = L'ó', |
| [KC_A] = L'á', |
| [KC_Z] = L'ý', |
| }; |
| static wchar_t map_carka_ucase[] = { |
| [KC_E] = L'É', |
| [KC_U] = L'Ú', |
| [KC_I] = L'Í', |
| [KC_O] = L'Ó', |
| [KC_A] = L'Á', |
| [KC_Z] = L'Ý', |
| }; |
| static wchar_t translate(unsigned int key, wchar_t *map, size_t map_length) |
| { |
| if (key >= map_length) |
| 207,18 → 272,73 |
| return map[key]; |
| } |
| static wchar_t layout_parse_ev(kbd_event_t *ev) |
| static wchar_t parse_ms_hacek(kbd_event_t *ev) |
| { |
| wchar_t c; |
| mstate = ms_start; |
| /* Produce no characters when Ctrl or Alt is pressed. */ |
| if ((ev->mods & (KM_CTRL | KM_ALT)) != 0) |
| return 0; |
| if (((ev->mods & KM_SHIFT) != 0) ^ ((ev->mods & KM_CAPS_LOCK) != 0)) |
| c = translate(ev->key, map_hacek_ucase, sizeof(map_hacek_ucase) / sizeof(wchar_t)); |
| else |
| c = translate(ev->key, map_hacek_lcase, sizeof(map_hacek_lcase) / sizeof(wchar_t)); |
| return c; |
| } |
| static wchar_t parse_ms_carka(kbd_event_t *ev) |
| { |
| wchar_t c; |
| mstate = ms_start; |
| /* Produce no characters when Ctrl or Alt is pressed. */ |
| if ((ev->mods & (KM_CTRL | KM_ALT)) != 0) |
| return 0; |
| if (((ev->mods & KM_SHIFT) != 0) ^ ((ev->mods & KM_CAPS_LOCK) != 0)) |
| c = translate(ev->key, map_carka_ucase, sizeof(map_carka_ucase) / sizeof(wchar_t)); |
| else |
| c = translate(ev->key, map_carka_lcase, sizeof(map_carka_lcase) / sizeof(wchar_t)); |
| return c; |
| } |
| static wchar_t parse_ms_start(kbd_event_t *ev) |
| { |
| wchar_t c; |
| /* Produce no characters when Ctrl or Alt is pressed. */ |
| if ((ev->mods & (KM_CTRL | KM_ALT)) != 0) |
| return 0; |
| if (ev->key == KC_EQUALS) { |
| if ((ev->mods & KM_SHIFT) != 0) |
| mstate = ms_hacek; |
| else |
| mstate = ms_carka; |
| return 0; |
| } |
| c = translate(ev->key, map_neutral, sizeof(map_neutral) / sizeof(wchar_t)); |
| if (c != 0) |
| return c; |
| if ((ev->mods & KM_SHIFT) == 0) { |
| if ((ev->mods & KM_CAPS_LOCK) != 0) |
| c = translate(ev->key, map_ns_caps, sizeof(map_ns_caps) / sizeof(wchar_t)); |
| else |
| c = translate(ev->key, map_ns_nocaps, sizeof(map_ns_nocaps) / sizeof(wchar_t)); |
| if (c != 0) |
| return c; |
| } |
| if (((ev->mods & KM_SHIFT) != 0) ^ ((ev->mods & KM_CAPS_LOCK) != 0)) |
| c = translate(ev->key, map_ucase, sizeof(map_ucase) / sizeof(wchar_t)); |
| else |
| 243,6 → 363,41 |
| return c; |
| } |
| static bool key_is_mod(unsigned key) |
| { |
| switch (key) { |
| case KC_LSHIFT: |
| case KC_RSHIFT: |
| case KC_LALT: |
| case KC_RALT: |
| case KC_LCTRL: |
| case KC_RCTRL: |
| return true; |
| default: |
| return false; |
| } |
| } |
| static void layout_reset(void) |
| { |
| mstate = ms_start; |
| } |
| static wchar_t layout_parse_ev(kbd_event_t *ev) |
| { |
| if (ev->type != KE_PRESS) |
| return '\0'; |
| if (key_is_mod(ev->key)) |
| return '\0'; |
| switch (mstate) { |
| case ms_start: return parse_ms_start(ev); |
| case ms_hacek: return parse_ms_hacek(ev); |
| case ms_carka: return parse_ms_carka(ev); |
| } |
| } |
| /** |
| * @} |
| */ |
| /branches/network/uspace/srv/kbd/layout/us_dvorak.c |
|---|
| 36,9 → 36,11 |
| #include <kbd/keycode.h> |
| #include <layout.h> |
| static void layout_reset(void); |
| static wchar_t layout_parse_ev(kbd_event_t *ev); |
| layout_op_t us_dvorak_op = { |
| layout_reset, |
| layout_parse_ev |
| }; |
| 203,6 → 205,10 |
| return map[key]; |
| } |
| static void layout_reset(void) |
| { |
| } |
| static wchar_t layout_parse_ev(kbd_event_t *ev) |
| { |
| wchar_t c; |