Index: uspace/drv/usbkbd/conv.c =================================================================== --- uspace/drv/usbkbd/conv.c (revision e2b15486aeb1cc59be933d1e08b3299f89aebd7b) +++ uspace/drv/usbkbd/conv.c (revision e2b15486aeb1cc59be933d1e08b3299f89aebd7b) @@ -0,0 +1,190 @@ +/* + * Copyright (c) 2011 Lubos Slovak + * 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. + */ +#include +#include +#include "conv.h" + +static int scanmap_simple[] = { + + [0x29] = KC_BACKTICK, + + [0x02] = KC_1, + [0x03] = KC_2, + [0x04] = KC_3, + [0x05] = KC_4, + [0x06] = KC_5, + [0x07] = KC_6, +// [0x08] = KC_7, + [0x09] = KC_8, + [0x0a] = KC_9, +// [0x0b] = KC_0, + + [0x0c] = KC_MINUS, + [0x0d] = KC_EQUALS, + [0x0e] = KC_BACKSPACE, + +// [0x0f] = KC_TAB, + + [0x10] = KC_Q, + [0x11] = KC_W, + [0x08] = KC_E, // OK + [0x13] = KC_R, + [0x14] = KC_T, + [0x15] = KC_Y, + [0x16] = KC_U, + [0x17] = KC_I, + [0x12] = KC_O, // OK + [0x19] = KC_P, + + [0x1a] = KC_LBRACKET, + [0x1b] = KC_RBRACKET, + + [0x3a] = KC_CAPS_LOCK, + + [0x1e] = KC_A, + [0x1f] = KC_S, + [0x20] = KC_D, + [0x21] = KC_F, + [0x22] = KC_G, + [0x0B] = KC_H, // OK + [0x24] = KC_J, + [0x25] = KC_K, + [0x0F] = KC_L, // OK + + [0x27] = KC_SEMICOLON, + [0x28] = KC_QUOTE, + [0x2b] = KC_BACKSLASH, + + [0x2a] = KC_LSHIFT, + + [0x2c] = KC_Z, + [0x2d] = KC_X, + [0x2e] = KC_C, + [0x2f] = KC_V, + [0x30] = KC_B, + [0x31] = KC_N, + [0x32] = KC_M, + + [0x33] = KC_COMMA, + [0x34] = KC_PERIOD, + [0x35] = KC_SLASH, + + [0x36] = KC_RSHIFT, + + [0x1d] = KC_LCTRL, + [0x38] = KC_LALT, + [0x39] = KC_SPACE, + + [0x01] = KC_ESCAPE, + + [0x3b] = KC_F1, + [0x3c] = KC_F2, + [0x3d] = KC_F3, + [0x3e] = KC_F4, + [0x3f] = KC_F5, + [0x40] = KC_F6, + [0x41] = KC_F7, + + [0x42] = KC_F8, + [0x43] = KC_F9, + [0x44] = KC_F10, + + [0x57] = KC_F11, + [0x58] = KC_F12, + + [0x46] = KC_SCROLL_LOCK, + + [0x1c] = KC_ENTER, + + [0x45] = KC_NUM_LOCK, + [0x37] = KC_NTIMES, + [0x4a] = KC_NMINUS, + [0x4e] = KC_NPLUS, + [0x47] = KC_N7, + [0x48] = KC_N8, + [0x49] = KC_N9, + [0x4b] = KC_N4, + [0x4c] = KC_N5, + [0x4d] = KC_N6, + [0x4f] = KC_N1, + [0x50] = KC_N2, + [0x51] = KC_N3, + [0x52] = KC_N0, + [0x53] = KC_NPERIOD +}; + +unsigned int usbkbd_parse_scancode(int scancode) +{ +// console_ev_type_t type; + unsigned int key; + int *map = scanmap_simple; + size_t map_length = sizeof(scanmap_simple) / sizeof(int); + + /* + * ACK/NAK are returned as response to us sending a command. + * We are not interested in them. + */ +// if (scancode == SC_ACK || scancode == SC_NAK) +// return; + +// if (scancode == 0xe0) { +// ds = ds_e; +// return; +// } + +// switch (ds) { +// case ds_s: +// map = scanmap_simple; +// map_length = sizeof(scanmap_simple) / sizeof(int); +// break; +// case ds_e: +// map = scanmap_e0; +// map_length = sizeof(scanmap_e0) / sizeof(int); +// break; +// default: +// map = NULL; +// map_length = 0; +// } + +// ds = ds_s; + +// if (scancode & 0x80) { +// scancode &= ~0x80; +// type = KEY_RELEASE; +// } else { +// type = KEY_PRESS; +// } + + if ((scancode < 0) || ((size_t) scancode >= map_length)) + return -1; + + key = map[scancode]; +// if (key != 0) +// kbd_push_ev(type, key); + return key; +} Index: uspace/drv/usbkbd/conv.h =================================================================== --- uspace/drv/usbkbd/conv.h (revision e2b15486aeb1cc59be933d1e08b3299f89aebd7b) +++ uspace/drv/usbkbd/conv.h (revision e2b15486aeb1cc59be933d1e08b3299f89aebd7b) @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2011 Lubos Slovak + * 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 usb + * @{ + */ +/** @file + * @brief USB Scancode parser. + */ + +#ifndef USBHID_CONV_H_ +#define USBHID_CONV_H_ + +unsigned int usbkbd_parse_scancode(int scancode); + +#endif Index: uspace/drv/usbkbd/layout.h =================================================================== --- uspace/drv/usbkbd/layout.h (revision e2b15486aeb1cc59be933d1e08b3299f89aebd7b) +++ uspace/drv/usbkbd/layout.h (revision e2b15486aeb1cc59be933d1e08b3299f89aebd7b) @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2011 Lubos Slovak + * (copied from /uspace/srv/hid/kbd/include/layout.h) + * 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 usb + * @brief + * @ingroup + * @{ + */ +/** @file + */ + +#ifndef USBHID_LAYOUT_H_ +#define USBHID_LAYOUT_H_ + +#include +#include + +typedef struct { + void (*reset)(void); + wchar_t (*parse_ev)(console_event_t *); +} layout_op_t; + +extern layout_op_t us_qwerty_op; +extern layout_op_t us_dvorak_op; +extern layout_op_t cz_op; + +#endif + +/** + * @} + */ Index: uspace/drv/usbkbd/us_qwerty.c =================================================================== --- uspace/drv/usbkbd/us_qwerty.c (revision e2b15486aeb1cc59be933d1e08b3299f89aebd7b) +++ uspace/drv/usbkbd/us_qwerty.c (revision e2b15486aeb1cc59be933d1e08b3299f89aebd7b) @@ -0,0 +1,244 @@ +/* + * Copyright (c) 2009 Jiri Svoboda + * 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 usb + * @brief US QWERTY layout. + * @{ + */ + +//#include +#include +#include +#include "layout.h" + +static void layout_reset(void); +static wchar_t layout_parse_ev(console_event_t *ev); + +layout_op_t us_qwerty_op = { + layout_reset, + layout_parse_ev +}; + +static wchar_t map_lcase[] = { + [KC_Q] = 'q', + [KC_W] = 'w', + [KC_E] = 'e', + [KC_R] = 'r', + [KC_T] = 't', + [KC_Y] = 'y', + [KC_U] = 'u', + [KC_I] = 'i', + [KC_O] = 'o', + [KC_P] = 'p', + + [KC_A] = 'a', + [KC_S] = 's', + [KC_D] = 'd', + [KC_F] = 'f', + [KC_G] = 'g', + [KC_H] = 'h', + [KC_J] = 'j', + [KC_K] = 'k', + [KC_L] = 'l', + + [KC_Z] = 'z', + [KC_X] = 'x', + [KC_C] = 'c', + [KC_V] = 'v', + [KC_B] = 'b', + [KC_N] = 'n', + [KC_M] = 'm', +}; + +static wchar_t map_ucase[] = { + [KC_Q] = 'Q', + [KC_W] = 'W', + [KC_E] = 'E', + [KC_R] = 'R', + [KC_T] = 'T', + [KC_Y] = 'Y', + [KC_U] = 'U', + [KC_I] = 'I', + [KC_O] = 'O', + [KC_P] = 'P', + + [KC_A] = 'A', + [KC_S] = 'S', + [KC_D] = 'D', + [KC_F] = 'F', + [KC_G] = 'G', + [KC_H] = 'H', + [KC_J] = 'J', + [KC_K] = 'K', + [KC_L] = 'L', + + [KC_Z] = 'Z', + [KC_X] = 'X', + [KC_C] = 'C', + [KC_V] = 'V', + [KC_B] = 'B', + [KC_N] = 'N', + [KC_M] = 'M', +}; + +static wchar_t map_not_shifted[] = { + [KC_BACKTICK] = '`', + + [KC_1] = '1', + [KC_2] = '2', + [KC_3] = '3', + [KC_4] = '4', + [KC_5] = '5', + [KC_6] = '6', + [KC_7] = '7', + [KC_8] = '8', + [KC_9] = '9', + [KC_0] = '0', + + [KC_MINUS] = '-', + [KC_EQUALS] = '=', + + [KC_LBRACKET] = '[', + [KC_RBRACKET] = ']', + + [KC_SEMICOLON] = ';', + [KC_QUOTE] = '\'', + [KC_BACKSLASH] = '\\', + + [KC_COMMA] = ',', + [KC_PERIOD] = '.', + [KC_SLASH] = '/', +}; + +static wchar_t map_shifted[] = { + [KC_BACKTICK] = '~', + + [KC_1] = '!', + [KC_2] = '@', + [KC_3] = '#', + [KC_4] = '$', + [KC_5] = '%', + [KC_6] = '^', + [KC_7] = '&', + [KC_8] = '*', + [KC_9] = '(', + [KC_0] = ')', + + [KC_MINUS] = '_', + [KC_EQUALS] = '+', + + [KC_LBRACKET] = '{', + [KC_RBRACKET] = '}', + + [KC_SEMICOLON] = ':', + [KC_QUOTE] = '"', + [KC_BACKSLASH] = '|', + + [KC_COMMA] = '<', + [KC_PERIOD] = '>', + [KC_SLASH] = '?', +}; + +static wchar_t map_neutral[] = { + [KC_BACKSPACE] = '\b', + [KC_TAB] = '\t', + [KC_ENTER] = '\n', + [KC_SPACE] = ' ', + + [KC_NSLASH] = '/', + [KC_NTIMES] = '*', + [KC_NMINUS] = '-', + [KC_NPLUS] = '+', + [KC_NENTER] = '\n' +}; + +static wchar_t map_numeric[] = { + [KC_N7] = '7', + [KC_N8] = '8', + [KC_N9] = '9', + [KC_N4] = '4', + [KC_N5] = '5', + [KC_N6] = '6', + [KC_N1] = '1', + [KC_N2] = '2', + [KC_N3] = '3', + + [KC_N0] = '0', + [KC_NPERIOD] = '.' +}; + +static wchar_t translate(unsigned int key, wchar_t *map, size_t map_length) +{ + if (key >= map_length) + return 0; + return map[key]; +} + +static void layout_reset(void) +{ +} + +static wchar_t layout_parse_ev(console_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; + + c = translate(ev->key, map_neutral, sizeof(map_neutral) / 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 + c = translate(ev->key, map_lcase, sizeof(map_lcase) / sizeof(wchar_t)); + + if (c != 0) + return c; + + if ((ev->mods & KM_SHIFT) != 0) + c = translate(ev->key, map_shifted, sizeof(map_shifted) / sizeof(wchar_t)); + else + c = translate(ev->key, map_not_shifted, sizeof(map_not_shifted) / sizeof(wchar_t)); + + if (c != 0) + return c; + + if ((ev->mods & KM_NUM_LOCK) != 0) + c = translate(ev->key, map_numeric, sizeof(map_numeric) / sizeof(wchar_t)); + else + c = 0; + + return c; +} + +/** + * @} + */