Index: uspace/srv/hid/input/Makefile =================================================================== --- uspace/srv/hid/input/Makefile (revision 41c9a22781b4c78f8db54bb24e3990c7084fb70a) +++ uspace/srv/hid/input/Makefile (revision a8bf1ea1667dfba36a0d33626d9d4818cb4b5603) @@ -43,5 +43,4 @@ port/adb_mouse.c \ port/chardev.c \ - port/chardev_mouse.c \ port/gxemul.c \ port/msim.c \ @@ -52,5 +51,4 @@ proto/adb.c \ proto/mousedev.c \ - proto/ps2.c \ ctl/apple.c \ ctl/gxe_fb.c \ Index: uspace/srv/hid/input/generic/input.c =================================================================== --- uspace/srv/hid/input/generic/input.c (revision 41c9a22781b4c78f8db54bb24e3990c7084fb70a) +++ uspace/srv/hid/input/generic/input.c (revision a8bf1ea1667dfba36a0d33626d9d4818cb4b5603) @@ -418,7 +418,4 @@ kbd_add_dev(&pl050_port, &pc_ctl); #endif -#if defined(MACHINE_i460GX) - kbd_add_dev(&chardev_port, &pc_ctl); -#endif #if defined(MACHINE_ski) kbd_add_dev(&ski_port, &stty_ctl); @@ -453,7 +450,4 @@ * them automatically. */ -#if defined(MACHINE_i460GX) - mouse_add_dev(&chardev_mouse_port, &ps2_proto); -#endif #if defined(UARCH_ppc32) mouse_add_dev(&adb_mouse_port, &adb_proto); Index: uspace/srv/hid/input/include/mouse_proto.h =================================================================== --- uspace/srv/hid/input/include/mouse_proto.h (revision 41c9a22781b4c78f8db54bb24e3990c7084fb70a) +++ uspace/srv/hid/input/include/mouse_proto.h (revision a8bf1ea1667dfba36a0d33626d9d4818cb4b5603) @@ -48,5 +48,4 @@ extern mouse_proto_ops_t adb_proto; -extern mouse_proto_ops_t ps2_proto; extern mouse_proto_ops_t mousedev_proto; Index: uspace/srv/hid/input/port/chardev.c =================================================================== --- uspace/srv/hid/input/port/chardev.c (revision 41c9a22781b4c78f8db54bb24e3990c7084fb70a) +++ uspace/srv/hid/input/port/chardev.c (revision a8bf1ea1667dfba36a0d33626d9d4818cb4b5603) @@ -63,5 +63,4 @@ /** List of devices to try connecting to. */ static const char *in_devs[] = { - "char/ps2a", "char/s3c24ser" }; Index: pace/srv/hid/input/port/chardev_mouse.c =================================================================== --- uspace/srv/hid/input/port/chardev_mouse.c (revision 41c9a22781b4c78f8db54bb24e3990c7084fb70a) +++ (revision ) @@ -1,157 +1,0 @@ -/* - * 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) -{ - service_id_t service_id; - unsigned int i; - int rc; - - mouse_dev = mdev; - - for (i = 0; i < num_devs; i++) { - rc = loc_service_get_id(in_devs[i], &service_id, 0); - if (rc == EOK) - break; - } - - if (i >= num_devs) { - printf("%s: Could not find any suitable input device\n", NAME); - return -1; - } - - dev_sess = loc_service_connect(EXCHANGE_ATOMIC, service_id, - 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: pace/srv/hid/input/proto/ps2.c =================================================================== --- uspace/srv/hid/input/proto/ps2.c (revision 41c9a22781b4c78f8db54bb24e3990c7084fb70a) +++ (revision ) @@ -1,139 +1,0 @@ -/* - * 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_proto - * @ingroup input - * @{ - */ -/** - * @file - * @brief PS/2 protocol driver. - */ - -#include -#include -#include - -#define PS2_MOUSE_OUT_INIT 0xf4 -#define PS2_MOUSE_ACK 0xfa - -#define BUFSIZE 3 - -typedef struct { - union { - unsigned char data[BUFSIZE]; - struct { - unsigned int leftbtn : 1; - unsigned int rightbtn : 1; - unsigned int middlebtn : 1; - unsigned int isone : 1; /* Always one */ - unsigned int xsign : 1; - unsigned int ysign : 1; - unsigned int xovfl : 1; - unsigned int yovfl : 1; - unsigned char x; - unsigned char y; - } val; - } u; -} ps2packet_t; - -static ps2packet_t buf; -static unsigned int bufpos; -static unsigned int leftbtn; -static unsigned int rightbtn; -static unsigned int middlebtn; - -static mouse_dev_t *mouse_dev; - -static int ps2_proto_init(mouse_dev_t *mdev) -{ - mouse_dev = mdev; - bufpos = 0; - leftbtn = 0; - rightbtn = 0; - - mouse_dev->port_ops->write(PS2_MOUSE_OUT_INIT); - return 0; -} - -/** Convert 9-bit 2-complement signed number to integer */ -static int bit9toint(int sign, unsigned char data) -{ - int tmp; - - if (!sign) - return data; - - tmp = ((unsigned char) ~data) + 1; - return -tmp; -} - -/** Process mouse data */ -static void ps2_proto_parse(sysarg_t data) -{ - int x, y; - - /* Check that we have not lost synchronization */ - if (bufpos == 0 && !(data & 0x8)) - return; /* Synchro lost, ignore byte */ - - buf.u.data[bufpos++] = data; - if (bufpos == BUFSIZE) { - bufpos = 0; - - if (buf.u.val.leftbtn ^ leftbtn) { - leftbtn = buf.u.val.leftbtn; - mouse_push_event_button(mouse_dev, 1, leftbtn); - } - - if (buf.u.val.rightbtn ^ rightbtn) { - rightbtn = buf.u.val.rightbtn; - mouse_push_event_button(mouse_dev, 2, rightbtn); - } - - if (buf.u.val.middlebtn ^ middlebtn) { - middlebtn = buf.u.val.middlebtn; - mouse_push_event_button(mouse_dev, 3, middlebtn); - } - - x = bit9toint(buf.u.val.xsign, buf.u.val.x); - y = -bit9toint(buf.u.val.ysign, buf.u.val.y); - - if (x != 0 || y != 0) - mouse_push_event_move(mouse_dev, x, y, 0); - } -} - -mouse_proto_ops_t ps2_proto = { - .parse = ps2_proto_parse, - .init = ps2_proto_init -}; - -/** - * @} - */