Index: uspace/srv/hid/input/port/adb.c =================================================================== --- uspace/srv/hid/input/port/adb.c (revision a40dea38c9d586aa4f82dcde5704326ff5abae9d) +++ uspace/srv/hid/input/port/adb.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) @@ -93,5 +93,5 @@ async_exchange_end(exch); if (rc != EOK) { - printf(NAME ": Failed to create callback from device\n"); + printf("%s: Failed to create callback from device\n", NAME); async_hangup(dev_sess); return rc; @@ -142,13 +142,12 @@ static void adb_kbd_reg0_data(uint16_t data) { - uint8_t b0, b1; - - b0 = (data >> 8) & 0xff; - b1 = data & 0xff; - + uint8_t b0 = (data >> 8) & 0xff; + uint8_t b1 = data & 0xff; + if (b0 != 0xff) - kbd_push_scancode(kbd_dev, b0); + kbd_push_data(kbd_dev, b0); + if (b1 != 0xff) - kbd_push_scancode(kbd_dev, b1); + kbd_push_data(kbd_dev, b1); } Index: uspace/srv/hid/input/port/adb_mouse.c =================================================================== --- uspace/srv/hid/input/port/adb_mouse.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) +++ uspace/srv/hid/input/port/adb_mouse.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) @@ -0,0 +1,131 @@ +/* + * Copyright (c) 2011 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 mouse_port + * @ingroup mouse + * @{ + */ +/** @file + * @brief ADB mouse port driver. + */ + +#include +#include +#include +#include +#include +#include +#include + +static mouse_dev_t *mouse_dev; +static async_sess_t *dev_sess; + +static void mouse_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg) +{ + /* Ignore parameters, the connection is already opened */ + while (true) { + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + + int retval; + + if (!IPC_GET_IMETHOD(call)) { + /* TODO: Handle hangup */ + return; + } + + switch (IPC_GET_IMETHOD(call)) { + case ADB_REG_NOTIF: + mouse_push_data(mouse_dev, IPC_GET_ARG1(call)); + break; + default: + retval = ENOENT; + } + + async_answer_0(callid, retval); + } +} + +static int adb_port_init(mouse_dev_t *mdev) +{ + const char *dev = "adb/mouse"; + + mouse_dev = mdev; + + devmap_handle_t handle; + int rc = devmap_device_get_handle(dev, &handle, 0); + if (rc != EOK) + return rc; + + dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle, 0); + if (dev_sess == NULL) { + printf("%s: Failed to connect to device\n", NAME); + return ENOENT; + } + + async_exch_t *exch = async_exchange_begin(dev_sess); + if (exch == NULL) { + printf("%s: Failed starting exchange with device\n", NAME); + async_hangup(dev_sess); + return ENOMEM; + } + + /* NB: The callback connection is slotted for removal */ + rc = async_connect_to_me(exch, 0, 0, 0, mouse_port_events, NULL); + async_exchange_end(exch); + if (rc != EOK) { + printf("%s: Failed to create callback from device\n", NAME); + async_hangup(dev_sess); + return rc; + } + + return EOK; +} + +static void adb_port_yield(void) +{ +} + +static void adb_port_reclaim(void) +{ +} + +static void adb_port_write(uint8_t data) +{ +} + +mouse_port_ops_t adb_mouse_port = { + .init = adb_port_init, + .yield = adb_port_yield, + .reclaim = adb_port_reclaim, + .write = adb_port_write +}; + +/** + * @} + */ Index: uspace/srv/hid/input/port/chardev.c =================================================================== --- uspace/srv/hid/input/port/chardev.c (revision a40dea38c9d586aa4f82dcde5704326ff5abae9d) +++ uspace/srv/hid/input/port/chardev.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) @@ -108,5 +108,5 @@ if (rc != 0) { - printf(NAME ": Failed to create callback from device\n"); + printf("%s: Failed to create callback from device\n", NAME); async_hangup(dev_sess); return -1; @@ -153,5 +153,5 @@ switch (IPC_GET_IMETHOD(call)) { case CHAR_NOTIF_BYTE: - kbd_push_scancode(kbd_dev, IPC_GET_ARG1(call)); + kbd_push_data(kbd_dev, IPC_GET_ARG1(call)); break; default: Index: uspace/srv/hid/input/port/chardev_mouse.c =================================================================== --- uspace/srv/hid/input/port/chardev_mouse.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) +++ uspace/srv/hid/input/port/chardev_mouse.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) @@ -0,0 +1,157 @@ +/* + * Copyright (c) 2011 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 mouse_port + * @ingroup mouse + * @{ + */ +/** @file + * @brief Chardev mouse port driver. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +static mouse_dev_t *mouse_dev; +static async_sess_t *dev_sess; + +/** List of devices to try connecting to. */ +static const char *in_devs[] = { + "char/ps2b", +}; + +static const unsigned int num_devs = sizeof(in_devs) / sizeof(in_devs[0]); + +static void mouse_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg) +{ + /* Ignore parameters, the connection is already opened */ + while (true) { + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + + if (!IPC_GET_IMETHOD(call)) { + /* TODO: Handle hangup */ + return; + } + + int retval; + + switch (IPC_GET_IMETHOD(call)) { + case CHAR_NOTIF_BYTE: + mouse_push_data(mouse_dev, IPC_GET_ARG1(call)); + break; + default: + retval = ENOENT; + } + + async_answer_0(callid, retval); + } +} + +static int chardev_port_init(mouse_dev_t *mdev) +{ + devmap_handle_t handle; + unsigned int i; + int rc; + + mouse_dev = mdev; + + for (i = 0; i < num_devs; i++) { + rc = devmap_device_get_handle(in_devs[i], &handle, 0); + if (rc == EOK) + break; + } + + if (i >= num_devs) { + printf("%s: Could not find any suitable input device\n", NAME); + return -1; + } + + dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle, + IPC_FLAG_BLOCKING); + if (dev_sess == NULL) { + printf("%s: Failed connecting to device\n", NAME); + return ENOENT; + } + + async_exch_t *exch = async_exchange_begin(dev_sess); + if (exch == NULL) { + printf("%s: Failed starting exchange with device\n", NAME); + async_hangup(dev_sess); + return ENOMEM; + } + + /* NB: The callback connection is slotted for removal */ + rc = async_connect_to_me(exch, 0, 0, 0, mouse_port_events, NULL); + async_exchange_end(exch); + + if (rc != 0) { + printf("%s: Failed to create callback from device\n", NAME); + async_hangup(dev_sess); + return -1; + } + + return 0; +} + +static void chardev_port_yield(void) +{ +} + +static void chardev_port_reclaim(void) +{ +} + +static void chardev_port_write(uint8_t data) +{ + async_exch_t *exch = async_exchange_begin(dev_sess); + if (exch == NULL) { + printf("%s: Failed starting exchange with device\n", NAME); + return; + } + + async_msg_1(exch, CHAR_WRITE_BYTE, data); + async_exchange_end(exch); +} + +mouse_port_ops_t chardev_mouse_port = { + .init = chardev_port_init, + .yield = chardev_port_yield, + .reclaim = chardev_port_reclaim, + .write = chardev_port_write +}; + +/** + * @} + */ Index: uspace/srv/hid/input/port/gxemul.c =================================================================== --- uspace/srv/hid/input/port/gxemul.c (revision a40dea38c9d586aa4f82dcde5704326ff5abae9d) +++ uspace/srv/hid/input/port/gxemul.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) @@ -108,15 +108,12 @@ /** Process data sent when a key is pressed. - * - * @param keybuffer Buffer of pressed keys. - * @param call IPC call. * - * @return Always 1. + * @param keybuffer Buffer of pressed keys. + * @param call IPC call. + * */ static void gxemul_irq_handler(ipc_callid_t iid, ipc_call_t *call) { - int scan_code = IPC_GET_ARG2(*call); - - kbd_push_scancode(kbd_dev, scan_code); + kbd_push_data(kbd_dev, IPC_GET_ARG2(*call)); } Index: uspace/srv/hid/input/port/msim.c =================================================================== --- uspace/srv/hid/input/port/msim.c (revision a40dea38c9d586aa4f82dcde5704326ff5abae9d) +++ uspace/srv/hid/input/port/msim.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) @@ -109,8 +109,7 @@ static void msim_irq_handler(ipc_callid_t iid, ipc_call_t *call) { - int scan_code = IPC_GET_ARG2(*call); - kbd_push_scancode(kbd_dev, scan_code); + kbd_push_data(kbd_dev, IPC_GET_ARG2(*call)); } /** @} -*/ + */ Index: uspace/srv/hid/input/port/niagara.c =================================================================== --- uspace/srv/hid/input/port/niagara.c (revision a40dea38c9d586aa4f82dcde5704326ff5abae9d) +++ uspace/srv/hid/input/port/niagara.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) @@ -148,6 +148,6 @@ c = input_buffer->data[input_buffer->read_ptr]; input_buffer->read_ptr = - ((input_buffer->read_ptr) + 1) % INPUT_BUFFER_SIZE; - kbd_push_scancode(kbd_dev, c); + ((input_buffer->read_ptr) + 1) % INPUT_BUFFER_SIZE; + kbd_push_data(kbd_dev, c); } } Index: uspace/srv/hid/input/port/ns16550.c =================================================================== --- uspace/srv/hid/input/port/ns16550.c (revision a40dea38c9d586aa4f82dcde5704326ff5abae9d) +++ uspace/srv/hid/input/port/ns16550.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) @@ -156,6 +156,5 @@ static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call) { - int scan_code = IPC_GET_ARG2(*call); - kbd_push_scancode(kbd_dev, scan_code); + kbd_push_data(kbd_dev, IPC_GET_ARG2(*call)); if (irc_service) Index: uspace/srv/hid/input/port/pl050.c =================================================================== --- uspace/srv/hid/input/port/pl050.c (revision a40dea38c9d586aa4f82dcde5704326ff5abae9d) +++ uspace/srv/hid/input/port/pl050.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) @@ -137,11 +137,8 @@ static void pl050_irq_handler(ipc_callid_t iid, ipc_call_t *call) { - int scan_code = IPC_GET_ARG2(*call); - - kbd_push_scancode(kbd_dev, scan_code); - return; + kbd_push_data(kbd_dev, IPC_GET_ARG2(*call)); } /** * @} - */ + */ Index: uspace/srv/hid/input/port/sgcn.c =================================================================== --- uspace/srv/hid/input/port/sgcn.c (revision a40dea38c9d586aa4f82dcde5704326ff5abae9d) +++ uspace/srv/hid/input/port/sgcn.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) @@ -183,6 +183,6 @@ *in_rdptr_ptr = (((*in_rdptr_ptr) - begin + 1) % size) + begin; buf_ptr = (volatile char *) - SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr); - kbd_push_scancode(kbd_dev, c); + SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr); + kbd_push_data(kbd_dev, c); } } Index: uspace/srv/hid/input/port/ski.c =================================================================== --- uspace/srv/hid/input/port/ski.c (revision a40dea38c9d586aa4f82dcde5704326ff5abae9d) +++ uspace/srv/hid/input/port/ski.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) @@ -110,5 +110,5 @@ if (c == 0) break; - kbd_push_scancode(kbd_dev, c); + kbd_push_data(kbd_dev, c); } Index: uspace/srv/hid/input/port/z8530.c =================================================================== --- uspace/srv/hid/input/port/z8530.c (revision a40dea38c9d586aa4f82dcde5704326ff5abae9d) +++ uspace/srv/hid/input/port/z8530.c (revision 1875a0cf8b7ababbd10c80d697a15be242d70773) @@ -142,6 +142,5 @@ static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call) { - int scan_code = IPC_GET_ARG2(*call); - kbd_push_scancode(kbd_dev, scan_code); + kbd_push_data(kbd_dev, IPC_GET_ARG2(*call)); if (irc_service)