Index: uspace/srv/hid/input/Makefile =================================================================== --- uspace/srv/hid/input/Makefile (revision 3dcc9d88e46814c79f55fc649b2f849dd2d0dc95) +++ uspace/srv/hid/input/Makefile (revision af0a2c7c1646c861334832d64f9f0977d0c2fada) @@ -42,5 +42,4 @@ port/niagara.c \ port/ns16550.c \ - port/pl050.c \ port/ski.c \ proto/adb.c \ @@ -48,5 +47,4 @@ ctl/apple.c \ ctl/kbdev.c \ - ctl/pc.c \ ctl/stty.c \ ctl/sun.c \ Index: uspace/srv/hid/input/ctl/pc.c =================================================================== --- uspace/srv/hid/input/ctl/pc.c (revision 3dcc9d88e46814c79f55fc649b2f849dd2d0dc95) +++ (revision ) @@ -1,285 +1,0 @@ -/* - * Copyright (c) 2011 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 kbd_ctl - * @ingroup input - * @{ - */ -/** - * @file - * @brief PC keyboard controller driver. - */ - -#include -#include -#include "../gsp.h" -#include "../kbd.h" -#include "../kbd_port.h" -#include "../kbd_ctl.h" - -static void pc_ctl_parse(sysarg_t); -static int pc_ctl_init(kbd_dev_t *); -static void pc_ctl_set_ind(kbd_dev_t *, unsigned int); - -kbd_ctl_ops_t pc_ctl = { - .parse = pc_ctl_parse, - .init = pc_ctl_init, - .set_ind = pc_ctl_set_ind -}; - -enum dec_state { - ds_s, - ds_e -}; - -enum special_code { - SC_ACK = 0xfa, - SC_NAK = 0xfe -}; - -enum lock_ind_bits { - LI_SCROLL = 0x01, - LI_NUM = 0x02, - LI_CAPS = 0x04 -}; - -enum kbd_command { - KBD_CMD_SET_LEDS = 0xed -}; - -static enum dec_state ds; -static kbd_dev_t *kbd_dev; - -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, - [0x12] = KC_E, - [0x13] = KC_R, - [0x14] = KC_T, - [0x15] = KC_Y, - [0x16] = KC_U, - [0x17] = KC_I, - [0x18] = KC_O, - [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, - [0x23] = KC_H, - [0x24] = KC_J, - [0x25] = KC_K, - [0x26] = KC_L, - - [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 -}; - -static int scanmap_e0[] = { - [0x38] = KC_RALT, - [0x1d] = KC_RCTRL, - - [0x37] = KC_PRTSCR, - - [0x52] = KC_INSERT, - [0x47] = KC_HOME, - [0x49] = KC_PAGE_UP, - - [0x53] = KC_DELETE, - [0x4f] = KC_END, - [0x51] = KC_PAGE_DOWN, - - [0x48] = KC_UP, - [0x4b] = KC_LEFT, - [0x50] = KC_DOWN, - [0x4d] = KC_RIGHT, - - [0x35] = KC_NSLASH, - [0x1c] = KC_NENTER -}; - -static int pc_ctl_init(kbd_dev_t *kdev) -{ - kbd_dev = kdev; - ds = ds_s; - return 0; -} - -static void pc_ctl_parse(sysarg_t scancode) -{ - kbd_event_type_t type; - unsigned int key; - int *map; - size_t map_length; - - /* - * 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 ((size_t) scancode >= map_length) - return; - - key = map[scancode]; - if (key != 0) - kbd_push_event(kbd_dev, type, key); -} - -static void pc_ctl_set_ind(kbd_dev_t *kdev, unsigned mods) -{ - uint8_t b; - - b = 0; - if ((mods & KM_CAPS_LOCK) != 0) - b = b | LI_CAPS; - if ((mods & KM_NUM_LOCK) != 0) - b = b | LI_NUM; - if ((mods & KM_SCROLL_LOCK) != 0) - b = b | LI_SCROLL; - - (*kbd_dev->port_ops->write)(KBD_CMD_SET_LEDS); - (*kbd_dev->port_ops->write)(b); -} - -/** - * @} - */ Index: uspace/srv/hid/input/input.c =================================================================== --- uspace/srv/hid/input/input.c (revision 3dcc9d88e46814c79f55fc649b2f849dd2d0dc95) +++ uspace/srv/hid/input/input.c (revision af0a2c7c1646c861334832d64f9f0977d0c2fada) @@ -539,7 +539,4 @@ kbd_add_dev(&chardev_port, &stty_ctl); #endif -#if defined(UARCH_arm32) && defined(MACHINE_integratorcp) - kbd_add_dev(&pl050_port, &pc_ctl); -#endif #if defined(MACHINE_ski) kbd_add_dev(&ski_port, &stty_ctl); Index: uspace/srv/hid/input/kbd_ctl.h =================================================================== --- uspace/srv/hid/input/kbd_ctl.h (revision 3dcc9d88e46814c79f55fc649b2f849dd2d0dc95) +++ uspace/srv/hid/input/kbd_ctl.h (revision af0a2c7c1646c861334832d64f9f0977d0c2fada) @@ -50,5 +50,4 @@ extern kbd_ctl_ops_t apple_ctl; extern kbd_ctl_ops_t kbdev_ctl; -extern kbd_ctl_ops_t pc_ctl; extern kbd_ctl_ops_t stty_ctl; extern kbd_ctl_ops_t sun_ctl; Index: uspace/srv/hid/input/kbd_port.h =================================================================== --- uspace/srv/hid/input/kbd_port.h (revision 3dcc9d88e46814c79f55fc649b2f849dd2d0dc95) +++ uspace/srv/hid/input/kbd_port.h (revision af0a2c7c1646c861334832d64f9f0977d0c2fada) @@ -52,5 +52,4 @@ extern kbd_port_ops_t niagara_port; extern kbd_port_ops_t ns16550_port; -extern kbd_port_ops_t pl050_port; extern kbd_port_ops_t ski_port; Index: uspace/srv/hid/input/port/pl050.c =================================================================== --- uspace/srv/hid/input/port/pl050.c (revision 3dcc9d88e46814c79f55fc649b2f849dd2d0dc95) +++ (revision ) @@ -1,137 +1,0 @@ -/* - * Copyright (c) 2009 Vineeth Pillai - * Copyright (c) 2011 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 kbd_port - * @ingroup kbd - * @{ - */ -/** @file - * @brief pl050 port driver. - */ - -#include -#include -#include -#include -#include -#include -#include "../kbd_port.h" -#include "../kbd.h" - -static int pl050_port_init(kbd_dev_t *); -static void pl050_port_write(uint8_t data); - -kbd_port_ops_t pl050_port = { - .init = pl050_port_init, - .write = pl050_port_write -}; - -static kbd_dev_t *kbd_dev; - -#define PL050_STAT 4 -#define PL050_DATA 8 - -#define PL050_STAT_RXFULL (1 << 4) - -static irq_pio_range_t pl050_ranges[] = { - { - .base = 0, - .size = 9, - } -}; - -static irq_cmd_t pl050_cmds[] = { - { - .cmd = CMD_PIO_READ_8, - .addr = NULL, - .dstarg = 1 - }, - { - .cmd = CMD_AND, - .value = PL050_STAT_RXFULL, - .srcarg = 1, - .dstarg = 3 - }, - { - .cmd = CMD_PREDICATE, - .value = 2, - .srcarg = 3 - }, - { - .cmd = CMD_PIO_READ_8, - .addr = NULL, /* Will be patched in run-time */ - .dstarg = 2 - }, - { - .cmd = CMD_ACCEPT - } -}; - -static irq_code_t pl050_kbd = { - sizeof(pl050_ranges) / sizeof(irq_pio_range_t), - pl050_ranges, - sizeof(pl050_cmds) / sizeof(irq_cmd_t), - pl050_cmds -}; - -static void pl050_irq_handler(ipc_callid_t iid, ipc_call_t *call, void *arg) -{ - kbd_push_data(kbd_dev, IPC_GET_ARG2(*call)); -} - -static int pl050_port_init(kbd_dev_t *kdev) -{ - kbd_dev = kdev; - - sysarg_t addr; - if (sysinfo_get_value("kbd.address.physical", &addr) != EOK) - return -1; - - pl050_kbd.ranges[0].base = addr; - pl050_kbd.cmds[0].addr = (void *) addr + PL050_STAT; - pl050_kbd.cmds[3].addr = (void *) addr + PL050_DATA; - - sysarg_t inr; - if (sysinfo_get_value("kbd.inr", &inr) != EOK) - return -1; - - async_irq_subscribe(inr, device_assign_devno(), pl050_irq_handler, NULL, - &pl050_kbd); - - return 0; -} - -static void pl050_port_write(uint8_t data) -{ - (void) data; -} - -/** - * @} - */