Index: uspace/srv/hid/adb_mouse/Makefile =================================================================== --- uspace/srv/hid/adb_mouse/Makefile (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) +++ uspace/srv/hid/adb_mouse/Makefile (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2010 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. +# + +USPACE_PREFIX = ../../.. +LIBS = $(LIBC_PREFIX)/libc.a +EXTRA_CFLAGS = -Iinclude + +OUTPUT = adb_ms + +SOURCES = \ + adb_mouse.c \ + adb_dev.c + +include ../../Makefile.common Index: uspace/srv/hid/adb_mouse/adb_dev.c =================================================================== --- uspace/srv/hid/adb_mouse/adb_dev.c (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) +++ uspace/srv/hid/adb_mouse/adb_dev.c (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2010 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 mouse + * @{ + */ +/** @file + * @brief + */ + +#include +#include +#include +#include +#include +#include + +#include "adb_mouse.h" +#include "adb_dev.h" + +static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall); + +static int dev_phone; + +int adb_dev_init(void) +{ + char *input = "/dev/adb/mouse"; + int input_fd; + + printf(NAME ": open %s\n", input); + + input_fd = open(input, O_RDONLY); + if (input_fd < 0) { + printf(NAME ": Failed opening %s (%d)\n", input, input_fd); + return false; + } + + dev_phone = fd_phone(input_fd); + if (dev_phone < 0) { + printf(NAME ": Failed to connect to device\n"); + return false; + } + + /* NB: The callback connection is slotted for removal */ + ipcarg_t phonehash; + if (ipc_connect_to_me(dev_phone, 0, 0, 0, &phonehash) != 0) { + printf(NAME ": Failed to create callback from device\n"); + return false; + } + + async_new_connection(phonehash, 0, NULL, adb_dev_events); + + return 0; +} + +static void adb_dev_events(ipc_callid_t iid, ipc_call_t *icall) +{ + /* Ignore parameters, the connection is already opened */ + while (true) { + + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + + int retval; + + switch (IPC_GET_METHOD(call)) { + case IPC_M_PHONE_HUNGUP: + /* TODO: Handle hangup */ + return; + case IPC_FIRST_USER_METHOD: + mouse_handle_data(IPC_GET_ARG1(call)); + break; + default: + retval = ENOENT; + } + ipc_answer_0(callid, retval); + } +} + +/** + * @} + */ Index: uspace/srv/hid/adb_mouse/adb_dev.h =================================================================== --- uspace/srv/hid/adb_mouse/adb_dev.h (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) +++ uspace/srv/hid/adb_mouse/adb_dev.h (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2010 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 mouse + * @brief + * @{ + */ +/** @file + */ + +#ifndef ADBDEV_H_ +#define ADBDEV_H_ + +#include + +extern int adb_dev_init(void); + +#endif + +/** + * @} + */ + Index: uspace/srv/hid/adb_mouse/adb_mouse.c =================================================================== --- uspace/srv/hid/adb_mouse/adb_mouse.c (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) +++ uspace/srv/hid/adb_mouse/adb_mouse.c (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) @@ -0,0 +1,173 @@ +/* + * Copyright (c) 2010 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 mouse + * @brief ADB Apple classic mouse driver. + * + * This driver handles a mouse connected to Apple Desktop Bus speaking + * the Apple classic protocol. It connects to an ADB driver. + * + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "adb_mouse.h" +#include "adb_dev.h" + +static void client_connection(ipc_callid_t iid, ipc_call_t *icall); +static void mouse_ev_btn(int button, int press); +static void mouse_ev_move(int dx, int dy); + +static int client_phone = -1; +static bool b1_pressed, b2_pressed; + +int main(int argc, char **argv) +{ + printf(NAME ": Chardev mouse driver\n"); + + /* Initialize device. */ + if (adb_dev_init() != 0) + return -1; + + b1_pressed = false; + b2_pressed = false; + + /* Register driver */ + int rc = devmap_driver_register(NAME, client_connection); + if (rc < 0) { + printf(NAME ": Unable to register driver (%d)\n", rc); + return -1; + } + + char dev_path[DEVMAP_NAME_MAXLEN + 1]; + snprintf(dev_path, DEVMAP_NAME_MAXLEN, "%s/mouse", NAMESPACE); + + dev_handle_t dev_handle; + if (devmap_device_register(dev_path, &dev_handle) != EOK) { + printf(NAME ": Unable to register device %s\n", dev_path); + return -1; + } + + printf(NAME ": Accepting connections\n"); + task_retval(0); + async_manager(); + + /* Not reached. */ + return 0; +} + +static void client_connection(ipc_callid_t iid, ipc_call_t *icall) +{ + ipc_callid_t callid; + ipc_call_t call; + int retval; + + ipc_answer_0(iid, EOK); + + while (1) { + callid = async_get_call(&call); + switch (IPC_GET_METHOD(call)) { + case IPC_M_PHONE_HUNGUP: + if (client_phone != -1) { + ipc_hangup(client_phone); + client_phone = -1; + } + + ipc_answer_0(callid, EOK); + return; + case IPC_M_CONNECT_TO_ME: + if (client_phone != -1) { + retval = ELIMIT; + break; + } + client_phone = IPC_GET_ARG5(call); + retval = 0; + break; + default: + retval = EINVAL; + } + ipc_answer_0(callid, retval); + } +} + +void mouse_handle_data(uint16_t data) +{ + bool b1, b2; + uint16_t udx, udy; + int dx, dy; + + /* Extract fields. */ + b1 = ((data >> 15) & 1) == 0; + udy = (data >> 8) & 0x7f; + b2 = ((data >> 7) & 1) == 0; + udx = data & 0x7f; + + /* Decode 7-bit two's complement signed values. */ + dx = (udx & 0x40) ? (udx - 0x80) : udx; + dy = (udy & 0x40) ? (udy - 0x80) : udy; + + if (b1 != b1_pressed) { + mouse_ev_btn(1, b1); + b1_pressed = b1; + } + + if (b2 != b2_pressed) { + mouse_ev_btn(2, b2); + b1_pressed = b1; + } + + if (dx != 0 || dy != 0) + mouse_ev_move(dx, dy); +} + +static void mouse_ev_btn(int button, int press) +{ + if (client_phone != -1) { + async_msg_2(client_phone, MEVENT_BUTTON, button, press); + } +} + +static void mouse_ev_move(int dx, int dy) +{ + if (client_phone != -1) + async_msg_2(client_phone, MEVENT_MOVE, dx, dy); +} + +/** + * @} + */ Index: uspace/srv/hid/adb_mouse/adb_mouse.h =================================================================== --- uspace/srv/hid/adb_mouse/adb_mouse.h (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) +++ uspace/srv/hid/adb_mouse/adb_mouse.h (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2010 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 mouse + * @brief + * @{ + */ +/** @file + */ + +#ifndef ADB_MOUSE_H_ +#define ADB_MOUSE_H_ + +#include + +#define NAME "adb_ms" +#define NAMESPACE "hid_in" + +extern void mouse_handle_data(uint16_t); + +#endif + +/** + * @} + */ Index: uspace/srv/hid/c_mouse/Makefile =================================================================== --- uspace/srv/hid/c_mouse/Makefile (revision 3a2f8aa1cef1886a9586c9987617553007802c3f) +++ (revision ) @@ -1,41 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# 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. -# - -USPACE_PREFIX = ../../.. -LIBS = $(LIBC_PREFIX)/libc.a -EXTRA_CFLAGS = -Iinclude - -OUTPUT = c_mouse - -SOURCES = \ - proto/ps2.c \ - c_mouse.c \ - chardev.c - -include ../../Makefile.common Index: uspace/srv/hid/c_mouse/c_mouse.c =================================================================== --- uspace/srv/hid/c_mouse/c_mouse.c (revision 3a2f8aa1cef1886a9586c9987617553007802c3f) +++ (revision ) @@ -1,152 +1,0 @@ -/* - * 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 mouse - * @brief Chardev mouse driver. - * - * This is a common driver for mice attached to simple character devices - * (PS/2 mice, serial mice). - * - * @{ - */ -/** @file - */ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#define NAME "mouse" -#define NAMESPACE "hid_in" - -int client_phone = -1; - -void mouse_handle_byte(int byte) -{ -/* printf("mouse byte: 0x%x\n", byte);*/ - mouse_proto_parse_byte(byte); -} - -void mouse_ev_btn(int button, int press) -{ -/* printf("ev_btn: button %d, press %d\n", button, press);*/ - if (client_phone != -1) { - async_msg_2(client_phone, MEVENT_BUTTON, button, press); - } -} - -void mouse_ev_move(int dx, int dy) -{ -/* printf("ev_move: dx %d, dy %d\n", dx, dy);*/ - if (client_phone != -1) - async_msg_2(client_phone, MEVENT_MOVE, dx, dy); -} - -static void client_connection(ipc_callid_t iid, ipc_call_t *icall) -{ - ipc_callid_t callid; - ipc_call_t call; - int retval; - - ipc_answer_0(iid, EOK); - - while (1) { - callid = async_get_call(&call); - switch (IPC_GET_METHOD(call)) { - case IPC_M_PHONE_HUNGUP: - if (client_phone != -1) { - ipc_hangup(client_phone); - client_phone = -1; - } - - ipc_answer_0(callid, EOK); - return; - case IPC_M_CONNECT_TO_ME: - if (client_phone != -1) { - retval = ELIMIT; - break; - } - client_phone = IPC_GET_ARG5(call); - retval = 0; - break; - default: - retval = EINVAL; - } - ipc_answer_0(callid, retval); - } -} - - -int main(int argc, char **argv) -{ - printf(NAME ": Chardev mouse driver\n"); - - /* Initialize port. */ - if (mouse_port_init() != 0) - return -1; - - /* Initialize protocol driver. */ - if (mouse_proto_init() != 0) - return -1; - - /* Register driver */ - int rc = devmap_driver_register(NAME, client_connection); - if (rc < 0) { - printf(NAME ": Unable to register driver (%d)\n", rc); - return -1; - } - - char dev_path[DEVMAP_NAME_MAXLEN + 1]; - snprintf(dev_path, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME); - - dev_handle_t dev_handle; - if (devmap_device_register(dev_path, &dev_handle) != EOK) { - printf(NAME ": Unable to register device %s\n", dev_path); - return -1; - } - - printf(NAME ": Accepting connections\n"); - task_retval(0); - async_manager(); - - /* Not reached. */ - return 0; -} - -/** - * @} - */ Index: uspace/srv/hid/c_mouse/chardev.c =================================================================== --- uspace/srv/hid/c_mouse/chardev.c (revision 3a2f8aa1cef1886a9586c9987617553007802c3f) +++ (revision ) @@ -1,122 +1,0 @@ -/* - * 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 mouse - * @{ - */ -/** @file - * @brief - */ - -#include -#include -#include -#include -#include -#include - -#include -#include - -static void chardev_events(ipc_callid_t iid, ipc_call_t *icall); - -static int dev_phone; - -#define NAME "kbd" - -int mouse_port_init(void) -{ - char *input = "/dev/char/ps2b"; - int input_fd; - - printf(NAME ": open %s\n", input); - - input_fd = open(input, O_RDONLY); - if (input_fd < 0) { - printf(NAME ": Failed opening %s (%d)\n", input, input_fd); - return false; - } - - dev_phone = fd_phone(input_fd); - if (dev_phone < 0) { - printf(NAME ": Failed to connect to device\n"); - return false; - } - - /* NB: The callback connection is slotted for removal */ - ipcarg_t phonehash; - if (ipc_connect_to_me(dev_phone, 0, 0, 0, &phonehash) != 0) { - printf(NAME ": Failed to create callback from device\n"); - return false; - } - - async_new_connection(phonehash, 0, NULL, chardev_events); - - return 0; -} - -void mouse_port_yield(void) -{ -} - -void mouse_port_reclaim(void) -{ -} - -void mouse_port_write(uint8_t data) -{ - async_msg_1(dev_phone, CHAR_WRITE_BYTE, data); -} - -static void chardev_events(ipc_callid_t iid, ipc_call_t *icall) -{ - /* Ignore parameters, the connection is already opened */ - while (true) { - - ipc_call_t call; - ipc_callid_t callid = async_get_call(&call); - - int retval; - - switch (IPC_GET_METHOD(call)) { - case IPC_M_PHONE_HUNGUP: - /* TODO: Handle hangup */ - return; - case IPC_FIRST_USER_METHOD: - mouse_handle_byte(IPC_GET_ARG1(call)); - break; - default: - retval = ENOENT; - } - ipc_answer_0(callid, retval); - } -} - -/** - * @} - */ Index: uspace/srv/hid/c_mouse/include/c_mouse.h =================================================================== --- uspace/srv/hid/c_mouse/include/c_mouse.h (revision 3a2f8aa1cef1886a9586c9987617553007802c3f) +++ (revision ) @@ -1,47 +1,0 @@ -/* - * 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 mouse - * @brief - * @{ - */ -/** @file - */ - -#ifndef C_MOUSE_H_ -#define C_MOUSE_H_ - -extern void mouse_handle_byte(int); -extern void mouse_ev_btn(int button, int press); -extern void mouse_ev_move(int dx, int dy); - -#endif - -/** - * @} - */ Index: uspace/srv/hid/c_mouse/include/mouse_port.h =================================================================== --- uspace/srv/hid/c_mouse/include/mouse_port.h (revision 3a2f8aa1cef1886a9586c9987617553007802c3f) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * 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 mouse - * @brief - * @{ - */ -/** @file - */ - -#ifndef MOUSE_PORT_H_ -#define MOUSE_PORT_H_ - -#include - -extern int mouse_port_init(void); -extern void mouse_port_yield(void); -extern void mouse_port_reclaim(void); -extern void mouse_port_write(uint8_t); - -#endif - -/** - * @} - */ - Index: uspace/srv/hid/c_mouse/include/mouse_proto.h =================================================================== --- uspace/srv/hid/c_mouse/include/mouse_proto.h (revision 3a2f8aa1cef1886a9586c9987617553007802c3f) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * 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 mouse - * @brief - * @{ - */ -/** @file - */ - -#ifndef MOUSE_PROTO_H_ -#define MOUSE_PROTO_H_ - -extern void mouse_proto_parse_byte(int); -extern int mouse_proto_init(void); - -#endif - -/** - * @} - */ Index: uspace/srv/hid/c_mouse/proto/ps2.c =================================================================== --- uspace/srv/hid/c_mouse/proto/ps2.c (revision 3a2f8aa1cef1886a9586c9987617553007802c3f) +++ (revision ) @@ -1,125 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * 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 - * @{ - */ -/** - * @file - * @brief PS/2 mouse protocol driver. - */ - -#include -#include -#include - -#define BUFSIZE 3 - -typedef struct { - union { - unsigned char data[BUFSIZE]; - struct { - unsigned leftbtn : 1; - unsigned rightbtn : 1; - unsigned middlebtn : 1; - unsigned isone : 1; /* Always one */ - unsigned xsign : 1; - unsigned ysign : 1; - unsigned xovfl : 1; - unsigned yovfl : 1; - unsigned char x; - unsigned char y; - } val; - } u; -} ps2packet_t; - -static ps2packet_t buf; -static int bufpos = 0; -static int leftbtn = 0; -static int rightbtn = 0; -static int middlebtn = 0; - -int mouse_proto_init(void) -{ - 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 */ -void mouse_proto_parse_byte(int 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_ev_btn(1, leftbtn); - } - - if (buf.u.val.rightbtn ^ rightbtn) { - rightbtn = buf.u.val.rightbtn; - mouse_ev_btn(2, rightbtn); - } - - if (buf.u.val.middlebtn ^ middlebtn) { - middlebtn = buf.u.val.middlebtn; - mouse_ev_btn(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_ev_move(x, y); - } - } - - return; -} - -/** - * @} - */ Index: uspace/srv/hid/char_mouse/Makefile =================================================================== --- uspace/srv/hid/char_mouse/Makefile (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) +++ uspace/srv/hid/char_mouse/Makefile (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) @@ -0,0 +1,41 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# 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. +# + +USPACE_PREFIX = ../../.. +LIBS = $(LIBC_PREFIX)/libc.a +EXTRA_CFLAGS = -Iinclude + +OUTPUT = char_ms + +SOURCES = \ + proto/ps2.c \ + char_mouse.c \ + chardev.c + +include ../../Makefile.common Index: uspace/srv/hid/char_mouse/char_mouse.c =================================================================== --- uspace/srv/hid/char_mouse/char_mouse.c (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) +++ uspace/srv/hid/char_mouse/char_mouse.c (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) @@ -0,0 +1,152 @@ +/* + * 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 mouse + * @brief Chardev mouse driver. + * + * This is a common driver for mice attached to simple character devices + * (PS/2 mice, serial mice). + * + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#define NAME "mouse" +#define NAMESPACE "hid_in" + +int client_phone = -1; + +void mouse_handle_byte(int byte) +{ +/* printf("mouse byte: 0x%x\n", byte);*/ + mouse_proto_parse_byte(byte); +} + +void mouse_ev_btn(int button, int press) +{ +/* printf("ev_btn: button %d, press %d\n", button, press);*/ + if (client_phone != -1) { + async_msg_2(client_phone, MEVENT_BUTTON, button, press); + } +} + +void mouse_ev_move(int dx, int dy) +{ +/* printf("ev_move: dx %d, dy %d\n", dx, dy);*/ + if (client_phone != -1) + async_msg_2(client_phone, MEVENT_MOVE, dx, dy); +} + +static void client_connection(ipc_callid_t iid, ipc_call_t *icall) +{ + ipc_callid_t callid; + ipc_call_t call; + int retval; + + ipc_answer_0(iid, EOK); + + while (1) { + callid = async_get_call(&call); + switch (IPC_GET_METHOD(call)) { + case IPC_M_PHONE_HUNGUP: + if (client_phone != -1) { + ipc_hangup(client_phone); + client_phone = -1; + } + + ipc_answer_0(callid, EOK); + return; + case IPC_M_CONNECT_TO_ME: + if (client_phone != -1) { + retval = ELIMIT; + break; + } + client_phone = IPC_GET_ARG5(call); + retval = 0; + break; + default: + retval = EINVAL; + } + ipc_answer_0(callid, retval); + } +} + + +int main(int argc, char **argv) +{ + printf(NAME ": Chardev mouse driver\n"); + + /* Initialize port. */ + if (mouse_port_init() != 0) + return -1; + + /* Initialize protocol driver. */ + if (mouse_proto_init() != 0) + return -1; + + /* Register driver */ + int rc = devmap_driver_register(NAME, client_connection); + if (rc < 0) { + printf(NAME ": Unable to register driver (%d)\n", rc); + return -1; + } + + char dev_path[DEVMAP_NAME_MAXLEN + 1]; + snprintf(dev_path, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME); + + dev_handle_t dev_handle; + if (devmap_device_register(dev_path, &dev_handle) != EOK) { + printf(NAME ": Unable to register device %s\n", dev_path); + return -1; + } + + printf(NAME ": Accepting connections\n"); + task_retval(0); + async_manager(); + + /* Not reached. */ + return 0; +} + +/** + * @} + */ Index: uspace/srv/hid/char_mouse/chardev.c =================================================================== --- uspace/srv/hid/char_mouse/chardev.c (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) +++ uspace/srv/hid/char_mouse/chardev.c (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) @@ -0,0 +1,122 @@ +/* + * 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 mouse + * @{ + */ +/** @file + * @brief + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +static void chardev_events(ipc_callid_t iid, ipc_call_t *icall); + +static int dev_phone; + +#define NAME "kbd" + +int mouse_port_init(void) +{ + char *input = "/dev/char/ps2b"; + int input_fd; + + printf(NAME ": open %s\n", input); + + input_fd = open(input, O_RDONLY); + if (input_fd < 0) { + printf(NAME ": Failed opening %s (%d)\n", input, input_fd); + return false; + } + + dev_phone = fd_phone(input_fd); + if (dev_phone < 0) { + printf(NAME ": Failed to connect to device\n"); + return false; + } + + /* NB: The callback connection is slotted for removal */ + ipcarg_t phonehash; + if (ipc_connect_to_me(dev_phone, 0, 0, 0, &phonehash) != 0) { + printf(NAME ": Failed to create callback from device\n"); + return false; + } + + async_new_connection(phonehash, 0, NULL, chardev_events); + + return 0; +} + +void mouse_port_yield(void) +{ +} + +void mouse_port_reclaim(void) +{ +} + +void mouse_port_write(uint8_t data) +{ + async_msg_1(dev_phone, CHAR_WRITE_BYTE, data); +} + +static void chardev_events(ipc_callid_t iid, ipc_call_t *icall) +{ + /* Ignore parameters, the connection is already opened */ + while (true) { + + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + + int retval; + + switch (IPC_GET_METHOD(call)) { + case IPC_M_PHONE_HUNGUP: + /* TODO: Handle hangup */ + return; + case IPC_FIRST_USER_METHOD: + mouse_handle_byte(IPC_GET_ARG1(call)); + break; + default: + retval = ENOENT; + } + ipc_answer_0(callid, retval); + } +} + +/** + * @} + */ Index: uspace/srv/hid/char_mouse/include/char_mouse.h =================================================================== --- uspace/srv/hid/char_mouse/include/char_mouse.h (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) +++ uspace/srv/hid/char_mouse/include/char_mouse.h (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) @@ -0,0 +1,47 @@ +/* + * 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 mouse + * @brief + * @{ + */ +/** @file + */ + +#ifndef CHAR_MOUSE_H_ +#define CHAR_MOUSE_H_ + +extern void mouse_handle_byte(int); +extern void mouse_ev_btn(int button, int press); +extern void mouse_ev_move(int dx, int dy); + +#endif + +/** + * @} + */ Index: uspace/srv/hid/char_mouse/include/mouse_port.h =================================================================== --- uspace/srv/hid/char_mouse/include/mouse_port.h (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) +++ uspace/srv/hid/char_mouse/include/mouse_port.h (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) @@ -0,0 +1,51 @@ +/* + * 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 mouse + * @brief + * @{ + */ +/** @file + */ + +#ifndef MOUSE_PORT_H_ +#define MOUSE_PORT_H_ + +#include + +extern int mouse_port_init(void); +extern void mouse_port_yield(void); +extern void mouse_port_reclaim(void); +extern void mouse_port_write(uint8_t); + +#endif + +/** + * @} + */ + Index: uspace/srv/hid/char_mouse/include/mouse_proto.h =================================================================== --- uspace/srv/hid/char_mouse/include/mouse_proto.h (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) +++ uspace/srv/hid/char_mouse/include/mouse_proto.h (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) @@ -0,0 +1,46 @@ +/* + * 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 mouse + * @brief + * @{ + */ +/** @file + */ + +#ifndef MOUSE_PROTO_H_ +#define MOUSE_PROTO_H_ + +extern void mouse_proto_parse_byte(int); +extern int mouse_proto_init(void); + +#endif + +/** + * @} + */ Index: uspace/srv/hid/char_mouse/proto/ps2.c =================================================================== --- uspace/srv/hid/char_mouse/proto/ps2.c (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) +++ uspace/srv/hid/char_mouse/proto/ps2.c (revision b73c26d0a9e1cc90dc174dbf3e084e09ed5b0e02) @@ -0,0 +1,125 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * 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 + * @{ + */ +/** + * @file + * @brief PS/2 mouse protocol driver. + */ + +#include +#include +#include + +#define BUFSIZE 3 + +typedef struct { + union { + unsigned char data[BUFSIZE]; + struct { + unsigned leftbtn : 1; + unsigned rightbtn : 1; + unsigned middlebtn : 1; + unsigned isone : 1; /* Always one */ + unsigned xsign : 1; + unsigned ysign : 1; + unsigned xovfl : 1; + unsigned yovfl : 1; + unsigned char x; + unsigned char y; + } val; + } u; +} ps2packet_t; + +static ps2packet_t buf; +static int bufpos = 0; +static int leftbtn = 0; +static int rightbtn = 0; +static int middlebtn = 0; + +int mouse_proto_init(void) +{ + 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 */ +void mouse_proto_parse_byte(int 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_ev_btn(1, leftbtn); + } + + if (buf.u.val.rightbtn ^ rightbtn) { + rightbtn = buf.u.val.rightbtn; + mouse_ev_btn(2, rightbtn); + } + + if (buf.u.val.middlebtn ^ middlebtn) { + middlebtn = buf.u.val.middlebtn; + mouse_ev_btn(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_ev_move(x, y); + } + } + + return; +} + +/** + * @} + */