Index: uspace/srv/bd/ata_bd/ata_bd.c =================================================================== --- uspace/srv/bd/ata_bd/ata_bd.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ uspace/srv/bd/ata_bd/ata_bd.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -59,4 +59,5 @@ #include #include +#include #include #include @@ -112,5 +113,5 @@ printf(NAME ": ATA disk driver\n"); - printf("I/O address 0x%p/0x%p\n", ctl_physical, cmd_physical); + printf("I/O address %p/%p\n", ctl_physical, cmd_physical); if (ata_bd_init() != EOK) @@ -180,9 +181,9 @@ } - printf(" %llu blocks", d->blocks, d->blocks / (2 * 1024)); + printf(" %" PRIu64 " blocks", d->blocks, d->blocks / (2 * 1024)); mbytes = d->blocks / (2 * 1024); if (mbytes > 0) - printf(" %llu MB.", mbytes); + printf(" %" PRIu64 " MB.", mbytes); printf("\n"); Index: uspace/srv/bd/part/guid_part/guid_part.c =================================================================== --- uspace/srv/bd/part/guid_part/guid_part.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ uspace/srv/bd/part/guid_part/guid_part.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -54,4 +54,6 @@ #include #include +#include +#include #include #include @@ -196,6 +198,6 @@ size_mb = (part->length * block_size + 1024 * 1024 - 1) / (1024 * 1024); - printf(NAME ": Registered device %s: %llu blocks %llu MB.\n", - name, part->length, size_mb); + printf(NAME ": Registered device %s: %" PRIu64 " blocks " + "%" PRIuBN " MB.\n", name, part->length, size_mb); part->dev = dev; Index: uspace/srv/bd/part/mbr_part/mbr_part.c =================================================================== --- uspace/srv/bd/part/mbr_part/mbr_part.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ uspace/srv/bd/part/mbr_part/mbr_part.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -64,4 +64,6 @@ #include #include +#include +#include #include #include @@ -247,6 +249,6 @@ size_mb = (part->length * block_size + 1024 * 1024 - 1) / (1024 * 1024); - printf(NAME ": Registered device %s: %llu blocks %llu MB.\n", - name, part->length, size_mb); + printf(NAME ": Registered device %s: %" PRIuBN " blocks " + "%" PRIu64 " MB.\n", name, part->length, size_mb); part->dev = dev; @@ -274,5 +276,5 @@ if (brb == NULL) { printf(NAME ": Failed allocating memory.\n"); - return ENOMEM; + return ENOMEM; } @@ -289,5 +291,6 @@ sgn = uint16_t_le2host(brb->signature); if (sgn != BR_SIGNATURE) { - printf(NAME ": Invalid boot record signature 0x%04X.\n", sgn); + printf(NAME ": Invalid boot record signature 0x%04" PRIX16 + ".\n", sgn); return EINVAL; } @@ -333,5 +336,6 @@ rc = block_read_direct(indev_handle, ba, 1, brb); if (rc != EOK) { - printf(NAME ": Failed reading EBR block at %u.\n", ba); + printf(NAME ": Failed reading EBR block at %" + PRIu32 ".\n", ba); return rc; } @@ -339,6 +343,6 @@ sgn = uint16_t_le2host(brb->signature); if (sgn != BR_SIGNATURE) { - printf(NAME ": Invalid boot record signature 0x%04X " - " in EBR at %u.\n", sgn, ba); + printf(NAME ": Invalid boot record signature 0x%04" + PRIX16 " in EBR at %" PRIu32 ".\n", sgn, ba); return EINVAL; } Index: uspace/srv/hid/adb_mouse/Makefile =================================================================== --- uspace/srv/hid/adb_mouse/Makefile (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/adb_mouse/Makefile (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -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 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/adb_mouse/adb_dev.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -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 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/adb_mouse/adb_dev.h (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -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 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/adb_mouse/adb_mouse.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -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 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/adb_mouse/adb_mouse.h (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -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 430de972b1d84a781af097751a7a28b988a72c5c) +++ (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 430de972b1d84a781af097751a7a28b988a72c5c) +++ (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 430de972b1d84a781af097751a7a28b988a72c5c) +++ (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 430de972b1d84a781af097751a7a28b988a72c5c) +++ (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 430de972b1d84a781af097751a7a28b988a72c5c) +++ (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 430de972b1d84a781af097751a7a28b988a72c5c) +++ (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 430de972b1d84a781af097751a7a28b988a72c5c) +++ (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 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/char_mouse/Makefile (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -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 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/char_mouse/char_mouse.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -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 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/char_mouse/chardev.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -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 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/char_mouse/include/char_mouse.h (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -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 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/char_mouse/include/mouse_port.h (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -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 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/char_mouse/include/mouse_proto.h (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -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 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/char_mouse/proto/ps2.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -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; +} + +/** + * @} + */ Index: uspace/srv/hid/kbd/Makefile.build =================================================================== --- uspace/srv/hid/kbd/Makefile.build (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ uspace/srv/hid/kbd/Makefile.build (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -125,6 +125,6 @@ ifeq ($(UARCH),ppc32) SOURCES += \ - port/dummy.c \ - ctl/stty.c + port/adb.c \ + ctl/apple.c endif Index: uspace/srv/hid/kbd/ctl/apple.c =================================================================== --- uspace/srv/hid/kbd/ctl/apple.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/kbd/ctl/apple.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -0,0 +1,209 @@ +/* + * 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 kbd_ctl + * @ingroup kbd + * @{ + */ +/** + * @file + * @brief Apple ADB keyboard controller driver. + */ + +#include +#include +#include +#include + +#define KBD_KEY_RELEASE 0x80 + +static int scanmap[]; + +int kbd_ctl_init(void) +{ + return 0; +} + +void kbd_ctl_parse_scancode(int scancode) +{ + console_ev_type_t type; + unsigned int key; + + if (scancode < 0 || scancode >= 0x100) + return; + + if (scancode & KBD_KEY_RELEASE) { + scancode &= ~KBD_KEY_RELEASE; + type = KEY_RELEASE; + } else { + type = KEY_PRESS; + } + + key = scanmap[scancode]; + if (key != 0) + kbd_push_ev(type, key); +} + +void kbd_ctl_set_ind(unsigned mods) +{ + (void) mods; +} + +static int scanmap[] = { + [0x00] = KC_A, + [0x01] = KC_S, + [0x02] = KC_D, + [0x03] = KC_F, + [0x04] = KC_H, + [0x05] = KC_G, + [0x06] = KC_Z, + [0x07] = KC_X, + [0x08] = KC_C, + [0x09] = KC_V, + [0x0a] = KC_BACKSLASH, + [0x0b] = KC_B, + [0x0c] = KC_Q, + [0x0d] = KC_W, + [0x0e] = KC_E, + [0x0f] = KC_R, + [0x10] = KC_Y, + [0x11] = KC_T, + [0x12] = KC_1, + [0x13] = KC_2, + [0x14] = KC_3, + [0x15] = KC_4, + [0x16] = KC_6, + [0x17] = KC_5, + [0x18] = KC_EQUALS, + [0x19] = KC_9, + [0x1a] = KC_7, + [0x1b] = KC_MINUS, + [0x1c] = KC_8, + [0x1d] = KC_0, + [0x1e] = KC_RBRACKET, + [0x1f] = KC_O, + [0x20] = KC_U, + [0x21] = KC_LBRACKET, + [0x22] = KC_I, + [0x23] = KC_P, + [0x24] = KC_ENTER, + [0x25] = KC_L, + [0x26] = KC_J, + [0x27] = KC_QUOTE, + [0x28] = KC_K, + [0x29] = KC_SEMICOLON, + [0x2a] = KC_BACKSLASH, + [0x2b] = KC_COMMA, + [0x2c] = KC_SLASH, + [0x2d] = KC_N, + [0x2e] = KC_M, + [0x2f] = KC_PERIOD, + [0x30] = KC_TAB, + [0x31] = KC_SPACE, + [0x32] = KC_BACKTICK, + [0x33] = KC_BACKSPACE, + [0x34] = 0, + [0x35] = KC_ESCAPE, + [0x36] = KC_LCTRL, + [0x37] = 0, + [0x38] = KC_LSHIFT, + [0x39] = KC_CAPS_LOCK, + [0x3a] = KC_LALT, + [0x3b] = KC_LEFT, + [0x3c] = KC_RIGHT, + [0x3d] = KC_DOWN, + [0x3e] = KC_UP, + [0x3f] = 0, + [0x40] = 0, + [0x41] = KC_NPERIOD, + [0x42] = 0, + [0x43] = KC_NTIMES, + [0x44] = 0, + [0x45] = KC_NPLUS, + [0x46] = 0, + [0x47] = KC_NUM_LOCK, + [0x48] = 0, + [0x49] = 0, + [0x4a] = 0, + [0x4b] = KC_NSLASH, + [0x4c] = KC_NENTER, + [0x4d] = 0, + [0x4e] = KC_NMINUS, + [0x4f] = 0, + [0x50] = 0, + [0x51] = 0, + [0x52] = KC_N0, + [0x53] = KC_N1, + [0x54] = KC_N2, + [0x55] = KC_N3, + [0x56] = KC_N4, + [0x57] = KC_N5, + [0x58] = KC_N6, + [0x59] = KC_N7, + [0x5a] = 0, + [0x5b] = KC_N8, + [0x5c] = KC_N9, + [0x5d] = 0, + [0x5e] = 0, + [0x5f] = 0, + [0x60] = KC_F5, + [0x61] = KC_F6, + [0x62] = KC_F7, + [0x63] = KC_F3, + [0x64] = KC_F8, + [0x65] = KC_F9, + [0x66] = 0, + [0x67] = KC_F11, + [0x68] = 0, + [0x69] = 0, + [0x6a] = 0, + [0x6b] = KC_SCROLL_LOCK, + [0x6c] = 0, + [0x6d] = KC_F10, + [0x6e] = 0, + [0x6f] = KC_F12, + [0x70] = 0, + [0x71] = 0, + [0x72] = KC_INSERT, + [0x73] = KC_HOME, + [0x74] = KC_PAGE_UP, + [0x75] = KC_DELETE, + [0x76] = KC_F4, + [0x77] = KC_END, + [0x78] = KC_F2, + [0x79] = KC_PAGE_DOWN, + [0x7a] = KC_F1, + [0x7b] = KC_RSHIFT, + [0x7c] = KC_RALT, + [0x7d] = KC_RCTRL, + [0x7e] = 0, + [0x7f] = 0 +}; + +/** @} + */ Index: uspace/srv/hid/kbd/port/adb.c =================================================================== --- uspace/srv/hid/kbd/port/adb.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hid/kbd/port/adb.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -0,0 +1,136 @@ +/* + * 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 kbd_port + * @ingroup kbd + * @{ + */ +/** @file + * @brief ADB keyboard port driver. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall); +static void adb_kbd_reg0_data(uint16_t data); + +static int dev_phone; + +#define NAME "kbd" + +int kbd_port_init(void) +{ + char *input = "/dev/adb/kbd"; + 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, kbd_port_events); + + return 0; +} + +void kbd_port_yield(void) +{ +} + +void kbd_port_reclaim(void) +{ +} + +void kbd_port_write(uint8_t data) +{ + /*async_msg_1(dev_phone, CHAR_WRITE_BYTE, data);*/ +} + +static void kbd_port_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 ADB_REG_NOTIF: + adb_kbd_reg0_data(IPC_GET_ARG1(call)); + break; + default: + retval = ENOENT; + } + ipc_answer_0(callid, retval); + } +} + +static void adb_kbd_reg0_data(uint16_t data) +{ + uint8_t b0, b1; + + b0 = (data >> 8) & 0xff; + b1 = data & 0xff; + + if (b0 != 0xff) + kbd_push_scancode(b0); + if (b1 != 0xff) + kbd_push_scancode(b1); +} + +/** + * @} + */ Index: uspace/srv/hid/kbd/port/i8042.h =================================================================== --- uspace/srv/hid/kbd/port/i8042.h (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * 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 i8042 port driver. - */ - -#ifndef KBD_PORT_i8042_H_ -#define KBD_PORT_i8042_H_ - -#include -#include - -struct i8042 { - ioport8_t data; - uint8_t pad[3]; - ioport8_t status; -} __attribute__ ((packed)); -typedef struct i8042 i8042_t; - -#endif - -/** - * @} - */ Index: uspace/srv/hw/bus/cuda_adb/Makefile =================================================================== --- uspace/srv/hw/bus/cuda_adb/Makefile (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hw/bus/cuda_adb/Makefile (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -0,0 +1,38 @@ +# +# 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 + +OUTPUT = cuda_adb + +SOURCES = \ + cuda_adb.c + +include ../../../Makefile.common + Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c =================================================================== --- uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -0,0 +1,517 @@ +/* + * 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 genarch + * @{ + */ +/** @file VIA-CUDA Apple Desktop Bus driver + * + * Note: We should really do a full bus scan at the beginning and resolve + * address conflicts. Also we should consider the handler ID in r3. Instead + * we just assume a keyboard at address 2 or 8 and a mouse at address 9. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "cuda_adb.h" + +#define NAME "cuda_adb" + +static void cuda_connection(ipc_callid_t iid, ipc_call_t *icall); +static int cuda_init(void); +static int cuda_claim(void); +static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call); + +static void cuda_irq_listen(void); +static void cuda_irq_receive(void); +static void cuda_irq_rcv_end(void *buf, size_t *len); +static void cuda_irq_send_start(void); +static void cuda_irq_send(void); + +static void cuda_packet_handle(uint8_t *buf, size_t len); +static void cuda_send_start(void); +static void cuda_autopoll_set(bool enable); + +static void adb_packet_handle(uint8_t *data, size_t size, bool autopoll); + + +/** B register fields */ +enum { + TREQ = 0x08, + TACK = 0x10, + TIP = 0x20 +}; + +/** IER register fields */ +enum { + IER_CLR = 0x00, + IER_SET = 0x80, + + SR_INT = 0x04, + ALL_INT = 0x7f +}; + +/** ACR register fields */ +enum { + SR_OUT = 0x10 +}; + +/** Packet types */ +enum { + PT_ADB = 0x00, + PT_CUDA = 0x01 +}; + +/** CUDA packet types */ +enum { + CPT_AUTOPOLL = 0x01 +}; + +enum { + ADB_MAX_ADDR = 16 +}; + +static irq_cmd_t cuda_cmds[] = { + { + .cmd = CMD_PIO_READ_8, + .addr = NULL, /* will be patched in run-time */ + .dstarg = 1 + }, + { + .cmd = CMD_BTEST, + .value = SR_INT, + .srcarg = 1, + .dstarg = 2 + }, + { + .cmd = CMD_PREDICATE, + .value = 1, + .srcarg = 2 + }, + { + .cmd = CMD_ACCEPT + } +}; + + +static irq_code_t cuda_irq_code = { + sizeof(cuda_cmds) / sizeof(irq_cmd_t), + cuda_cmds +}; + +static cuda_instance_t cinst; + +static cuda_instance_t *instance = &cinst; +static cuda_t *dev; + +static adb_dev_t adb_dev[ADB_MAX_ADDR]; + +int main(int argc, char *argv[]) +{ + dev_handle_t dev_handle; + int rc; + int i; + + printf(NAME ": VIA-CUDA Apple Desktop Bus driver\n"); + + for (i = 0; i < ADB_MAX_ADDR; ++i) { + adb_dev[i].client_phone = -1; + adb_dev[i].dev_handle = 0; + } + + rc = devmap_driver_register(NAME, cuda_connection); + if (rc < 0) { + printf(NAME ": Unable to register driver.\n"); + return rc; + } + + rc = devmap_device_register("adb/kbd", &dev_handle); + if (rc != EOK) { + devmap_hangup_phone(DEVMAP_DRIVER); + printf(NAME ": Unable to register device %s.\n", "adb/kdb"); + return rc; + } + + adb_dev[2].dev_handle = dev_handle; + adb_dev[8].dev_handle = dev_handle; + + rc = devmap_device_register("adb/mouse", &dev_handle); + if (rc != EOK) { + devmap_hangup_phone(DEVMAP_DRIVER); + printf(NAME ": Unable to register device %s.\n", "adb/mouse"); + return rc; + } + + adb_dev[9].dev_handle = dev_handle; + + if (cuda_init() < 0) { + printf("cuda_init() failed\n"); + return 1; + } + + task_retval(0); + async_manager(); + + return 0; +} + +/** Character device connection handler */ +static void cuda_connection(ipc_callid_t iid, ipc_call_t *icall) +{ + ipc_callid_t callid; + ipc_call_t call; + ipcarg_t method; + dev_handle_t dh; + int retval; + int dev_addr, i; + + /* Get the device handle. */ + dh = IPC_GET_ARG1(*icall); + + /* Determine which disk device is the client connecting to. */ + dev_addr = -1; + for (i = 0; i < ADB_MAX_ADDR; i++) { + if (adb_dev[i].dev_handle == dh) + dev_addr = i; + } + + if (dev_addr < 0) { + ipc_answer_0(iid, EINVAL); + return; + } + + /* Answer the IPC_M_CONNECT_ME_TO call. */ + ipc_answer_0(iid, EOK); + + while (1) { + callid = async_get_call(&call); + method = IPC_GET_METHOD(call); + switch (method) { + case IPC_M_PHONE_HUNGUP: + /* The other side has hung up. */ + ipc_answer_0(callid, EOK); + return; + case IPC_M_CONNECT_TO_ME: + if (adb_dev[dev_addr].client_phone != -1) { + retval = ELIMIT; + break; + } + adb_dev[dev_addr].client_phone = IPC_GET_ARG5(call); + /* + * A hack so that we send the data to the phone + * regardless of which address the device is on. + */ + for (i = 0; i < ADB_MAX_ADDR; ++i) { + if (adb_dev[i].dev_handle == dh) { + adb_dev[i].client_phone = IPC_GET_ARG5(call); + } + } + retval = 0; + break; + default: + retval = EINVAL; + break; + } + ipc_answer_0(callid, retval); + } +} + + +static int cuda_init(void) +{ + void *vaddr; + + instance->cuda_physical = sysinfo_value("cuda.address.physical"); + instance->cuda_kernel = sysinfo_value("cuda.address.kernel"); + + if (pio_enable((void *) instance->cuda_physical, sizeof(cuda_t), &vaddr) != 0) + return -1; + dev = vaddr; + + instance->cuda = dev; + instance->xstate = cx_listen; + instance->bidx = 0; + instance->snd_bytes = 0; + + fibril_mutex_initialize(&instance->dev_lock); + + /* Disable all interrupts from CUDA. */ + pio_write_8(&dev->ier, IER_CLR | ALL_INT); + + cuda_irq_code.cmds[0].addr = (void *) &((cuda_t *) instance->cuda_kernel)->ifr; + async_set_interrupt_received(cuda_irq_handler); + ipc_register_irq(10, device_assign_devno(), 0, &cuda_irq_code); + + /* Enable SR interrupt. */ + pio_write_8(&dev->ier, TIP | TREQ); + pio_write_8(&dev->ier, IER_SET | SR_INT); + + /* Enable ADB autopolling. */ + cuda_autopoll_set(true); + + return 0; +} + +static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call) +{ + uint8_t rbuf[CUDA_RCV_BUF_SIZE]; + size_t len; + bool handle; + + handle = false; + len = 0; + + fibril_mutex_lock(&instance->dev_lock); + + /* Lower IFR.SR_INT so that CUDA can generate next int by raising it. */ + pio_write_8(&instance->cuda->ifr, SR_INT); + + switch (instance->xstate) { + case cx_listen: cuda_irq_listen(); break; + case cx_receive: cuda_irq_receive(); break; + case cx_rcv_end: cuda_irq_rcv_end(rbuf, &len); + handle = true; break; + case cx_send_start: cuda_irq_send_start(); break; + case cx_send: cuda_irq_send(); break; + } + + fibril_mutex_unlock(&instance->dev_lock); + + /* Handle an incoming packet. */ + if (handle) + cuda_packet_handle(rbuf, len); +} + +/** Interrupt in listen state. + * + * Start packet reception. + */ +static void cuda_irq_listen(void) +{ + uint8_t b; + + b = pio_read_8(&dev->b); + + if ((b & TREQ) != 0) { + printf("cuda_irq_listen: no TREQ?!\n"); + return; + } + + pio_read_8(&dev->sr); + pio_write_8(&dev->b, pio_read_8(&dev->b) & ~TIP); + instance->xstate = cx_receive; +} + +/** Interrupt in receive state. + * + * Receive next byte of packet. + */ +static void cuda_irq_receive(void) +{ + uint8_t b, data; + + data = pio_read_8(&dev->sr); + if (instance->bidx < CUDA_RCV_BUF_SIZE) + instance->rcv_buf[instance->bidx++] = data; + + b = pio_read_8(&dev->b); + + if ((b & TREQ) == 0) { + pio_write_8(&dev->b, b ^ TACK); + } else { + pio_write_8(&dev->b, b | TACK | TIP); + instance->xstate = cx_rcv_end; + } +} + +/** Interrupt in rcv_end state. + * + * Terminate packet reception. Either go back to listen state or start + * receiving another packet if CUDA has one for us. + */ +static void cuda_irq_rcv_end(void *buf, size_t *len) +{ + uint8_t data, b; + + b = pio_read_8(&dev->b); + data = pio_read_8(&dev->sr); + + if ((b & TREQ) == 0) { + instance->xstate = cx_receive; + pio_write_8(&dev->b, b & ~TIP); + } else { + instance->xstate = cx_listen; + cuda_send_start(); + } + + memcpy(buf, instance->rcv_buf, instance->bidx); + *len = instance->bidx; + instance->bidx = 0; +} + +/** Interrupt in send_start state. + * + * Process result of sending first byte (and send second on success). + */ +static void cuda_irq_send_start(void) +{ + uint8_t b; + + b = pio_read_8(&dev->b); + + if ((b & TREQ) == 0) { + /* Collision */ + pio_write_8(&dev->acr, pio_read_8(&dev->acr) & ~SR_OUT); + pio_read_8(&dev->sr); + pio_write_8(&dev->b, pio_read_8(&dev->b) | TIP | TACK); + instance->xstate = cx_listen; + return; + } + + pio_write_8(&dev->sr, instance->snd_buf[1]); + pio_write_8(&dev->b, pio_read_8(&dev->b) ^ TACK); + instance->bidx = 2; + + instance->xstate = cx_send; +} + +/** Interrupt in send state. + * + * Send next byte or terminate transmission. + */ +static void cuda_irq_send(void) +{ + if (instance->bidx < instance->snd_bytes) { + /* Send next byte. */ + pio_write_8(&dev->sr, instance->snd_buf[instance->bidx++]); + pio_write_8(&dev->b, pio_read_8(&dev->b) ^ TACK); + return; + } + + /* End transfer. */ + instance->snd_bytes = 0; + instance->bidx = 0; + + pio_write_8(&dev->acr, pio_read_8(&dev->acr) & ~SR_OUT); + pio_read_8(&dev->sr); + pio_write_8(&dev->b, pio_read_8(&dev->b) | TACK | TIP); + + instance->xstate = cx_listen; + /* TODO: Match reply with request. */ +} + +static void cuda_packet_handle(uint8_t *data, size_t len) +{ + if (data[0] != PT_ADB) + return; + if (len < 2) + return; + + adb_packet_handle(data + 2, len - 2, (data[1] & 0x40) != 0); +} + +static void adb_packet_handle(uint8_t *data, size_t size, bool autopoll) +{ + uint8_t dev_addr; + uint8_t reg_no; + uint16_t reg_val; + unsigned i; + + dev_addr = data[0] >> 4; + reg_no = data[0] & 0x03; + + if (size != 3) { + printf("unrecognized packet, size=%d\n", size); + for (i = 0; i < size; ++i) { + printf(" 0x%02x", data[i]); + } + putchar('\n'); + return; + } + + if (reg_no != 0) { + printf("unrecognized packet, size=%d\n", size); + for (i = 0; i < size; ++i) { + printf(" 0x%02x", data[i]); + } + putchar('\n'); + return; + } + + reg_val = ((uint16_t) data[1] << 8) | (uint16_t) data[2]; + + if (adb_dev[dev_addr].client_phone == -1) + return; + + async_msg_1(adb_dev[dev_addr].client_phone, ADB_REG_NOTIF, reg_val); +} + +static void cuda_autopoll_set(bool enable) +{ + instance->snd_buf[0] = PT_CUDA; + instance->snd_buf[1] = CPT_AUTOPOLL; + instance->snd_buf[2] = enable ? 0x01 : 0x00; + instance->snd_bytes = 3; + instance->bidx = 0; + + cuda_send_start(); +} + +static void cuda_send_start(void) +{ + cuda_t *dev = instance->cuda; + + assert(instance->xstate == cx_listen); + + if (instance->snd_bytes == 0) + return; + + /* Check for incoming data. */ + if ((pio_read_8(&dev->b) & TREQ) == 0) + return; + + pio_write_8(&dev->acr, pio_read_8(&dev->acr) | SR_OUT); + pio_write_8(&dev->sr, instance->snd_buf[0]); + pio_write_8(&dev->b, pio_read_8(&dev->b) & ~TIP); + + instance->xstate = cx_send_start; +} + + +/** @} + */ Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.h =================================================================== --- uspace/srv/hw/bus/cuda_adb/cuda_adb.h (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/hw/bus/cuda_adb/cuda_adb.h (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2006 Martin Decky + * 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 genarch + * @{ + */ +/** @file + */ + +#ifndef CUDA_ADB_H_ +#define CUDA_ADB_H_ + +#include +#include +#include + +typedef struct { + uint8_t b; + uint8_t pad0[0x1ff]; + + uint8_t a; + uint8_t pad1[0x1ff]; + + uint8_t dirb; + uint8_t pad2[0x1ff]; + + uint8_t dira; + uint8_t pad3[0x1ff]; + + uint8_t t1cl; + uint8_t pad4[0x1ff]; + + uint8_t t1ch; + uint8_t pad5[0x1ff]; + + uint8_t t1ll; + uint8_t pad6[0x1ff]; + + uint8_t t1lh; + uint8_t pad7[0x1ff]; + + uint8_t t2cl; + uint8_t pad8[0x1ff]; + + uint8_t t2ch; + uint8_t pad9[0x1ff]; + + uint8_t sr; + uint8_t pad10[0x1ff]; + + uint8_t acr; + uint8_t pad11[0x1ff]; + + uint8_t pcr; + uint8_t pad12[0x1ff]; + + uint8_t ifr; + uint8_t pad13[0x1ff]; + + uint8_t ier; + uint8_t pad14[0x1ff]; + + uint8_t anh; + uint8_t pad15[0x1ff]; +} cuda_t; + +enum { + CUDA_RCV_BUF_SIZE = 5 +}; + +enum cuda_xfer_state { + cx_listen, + cx_receive, + cx_rcv_end, + cx_send_start, + cx_send +}; + +typedef struct { + dev_handle_t dev_handle; + int client_phone; +} adb_dev_t; + +typedef struct { + cuda_t *cuda; + uintptr_t cuda_physical; + uintptr_t cuda_kernel; + + uint8_t rcv_buf[CUDA_RCV_BUF_SIZE]; + uint8_t snd_buf[CUDA_RCV_BUF_SIZE]; + size_t bidx; + size_t snd_bytes; + enum cuda_xfer_state xstate; + fibril_mutex_t dev_lock; +} cuda_instance_t; + +#endif + +/** @} + */ Index: uspace/srv/loader/arch/amd64/Makefile.inc =================================================================== --- uspace/srv/loader/arch/amd64/Makefile.inc (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ uspace/srv/loader/arch/amd64/Makefile.inc (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -27,4 +27,3 @@ # -EXTRA_CFLAGS = -D__64_BITS__ ARCH_SOURCES := arch/$(UARCH)/amd64.s Index: uspace/srv/loader/arch/arm32/Makefile.inc =================================================================== --- uspace/srv/loader/arch/arm32/Makefile.inc (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ uspace/srv/loader/arch/arm32/Makefile.inc (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -27,4 +27,3 @@ # -EXTRA_CFLAGS = -D__32_BITS__ ARCH_SOURCES := arch/$(UARCH)/arm32.s Index: uspace/srv/loader/arch/ia32/Makefile.inc =================================================================== --- uspace/srv/loader/arch/ia32/Makefile.inc (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ uspace/srv/loader/arch/ia32/Makefile.inc (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -27,4 +27,3 @@ # -EXTRA_CFLAGS = -D__32_BITS__ ARCH_SOURCES := arch/$(UARCH)/ia32.s Index: uspace/srv/loader/arch/ia64/Makefile.inc =================================================================== --- uspace/srv/loader/arch/ia64/Makefile.inc (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ uspace/srv/loader/arch/ia64/Makefile.inc (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -27,5 +27,4 @@ # -EXTRA_CFLAGS = -D__64_BITS__ ARCH_SOURCES := arch/$(UARCH)/ia64.s AFLAGS += -xexplicit Index: uspace/srv/loader/arch/mips32/Makefile.inc =================================================================== --- uspace/srv/loader/arch/mips32/Makefile.inc (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ uspace/srv/loader/arch/mips32/Makefile.inc (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -27,4 +27,3 @@ # -EXTRA_CFLAGS = -D__32_BITS__ ARCH_SOURCES := arch/$(UARCH)/mips32.s Index: uspace/srv/loader/arch/ppc32/Makefile.inc =================================================================== --- uspace/srv/loader/arch/ppc32/Makefile.inc (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ uspace/srv/loader/arch/ppc32/Makefile.inc (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -27,4 +27,3 @@ # -EXTRA_CFLAGS = -D__32_BITS__ ARCH_SOURCES := arch/$(UARCH)/ppc32.s Index: uspace/srv/loader/arch/sparc64/Makefile.inc =================================================================== --- uspace/srv/loader/arch/sparc64/Makefile.inc (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ uspace/srv/loader/arch/sparc64/Makefile.inc (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -27,4 +27,3 @@ # -EXTRA_CFLAGS = -D__64_BITS__ ARCH_SOURCES := arch/$(UARCH)/sparc64.s Index: uspace/srv/loader/elf_load.c =================================================================== --- uspace/srv/loader/elf_load.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ uspace/srv/loader/elf_load.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -342,6 +342,6 @@ seg_ptr = (void *) seg_addr; - DPRINTF("Load segment at addr 0x%x, size 0x%x\n", seg_addr, - entry->p_memsz); + DPRINTF("Load segment at addr %p, size 0x%x\n", seg_addr, + entry->p_memsz); if (entry->p_align > 1) { @@ -370,5 +370,5 @@ mem_sz = entry->p_memsz + (entry->p_vaddr - base); - DPRINTF("Map to seg_addr=0x%x-0x%x.\n", seg_addr, + DPRINTF("Map to seg_addr=%p-%p.\n", seg_addr, entry->p_vaddr + bias + ALIGN_UP(entry->p_memsz, PAGE_SIZE)); @@ -384,5 +384,5 @@ } - DPRINTF("as_area_create(0x%lx, 0x%x, %d) -> 0x%lx\n", + DPRINTF("as_area_create(%p, 0x%x, %d) -> 0x%lx\n", base + bias, mem_sz, flags, (uintptr_t)a); @@ -461,5 +461,5 @@ elf->info->dynamic = (void *)((uint8_t *)entry->sh_addr + elf->bias); - DPRINTF("Dynamic section found at 0x%x.\n", + DPRINTF("Dynamic section found at %p.\n", (uintptr_t)elf->info->dynamic); break; Index: uspace/srv/loader/main.c =================================================================== --- uspace/srv/loader/main.c (revision 430de972b1d84a781af097751a7a28b988a72c5c) +++ uspace/srv/loader/main.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -392,5 +392,5 @@ /* Dynamically linked program */ DPRINTF("Run ELF interpreter.\n"); - DPRINTF("Entry point: 0x%lx\n", interp_info.entry); + DPRINTF("Entry point: %p\n", interp_info.entry); ipc_answer_0(rid, EOK); Index: uspace/srv/taskmon/Makefile =================================================================== --- uspace/srv/taskmon/Makefile (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/taskmon/Makefile (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -0,0 +1,37 @@ +# +# 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 + +OUTPUT = taskmon + +SOURCES = \ + taskmon.c + +include ../Makefile.common Index: uspace/srv/taskmon/taskmon.c =================================================================== --- uspace/srv/taskmon/taskmon.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) +++ uspace/srv/taskmon/taskmon.c (revision 28be7fa0fa0ad68be08aa62293dc4d0e38e07dca) @@ -0,0 +1,123 @@ +/* + * 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 taskmon + * @brief + * @{ + */ +/** + * @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define NAME "taskmon" + +static void fault_event(ipc_callid_t callid, ipc_call_t *call) +{ + char *argv[11]; + char *fname; + char *dump_fname; + char *s_taskid; + char **s; + + task_id_t taskid; + uintptr_t thread; + + taskid = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call)); + thread = IPC_GET_ARG3(*call); + + if (asprintf(&s_taskid, "%" PRIuTASKID, taskid) < 0) { + printf("Memory allocation failed.\n"); + return; + } + + if (asprintf(&dump_fname, "/scratch/d" PRIuTASKID ".txt", taskid) < 0) { + printf("Memory allocation failed.\n"); + return; + } + + printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread); + +#ifdef CONFIG_VERBOSE_DUMPS + argv[0] = "/app/redir"; + argv[1] = "-i"; + argv[2] = "/readme"; + argv[3] = "-o"; + argv[4] = dump_fname; + argv[5] = "--"; + argv[6] = "/app/taskdump"; + argv[7] = "-m"; + argv[8] = "-t"; + argv[9] = s_taskid; + argv[10] = NULL; +#else + argv[0] = "/app/taskdump"; + argv[1] = "-t"; + argv[2] = s_taskid; + argv[3] = NULL; +#endif + fname = argv[0]; + + printf(NAME ": Executing"); + s = argv; + while (*s != NULL) { + printf(" %s", *s); + ++s; + } + putchar('\n'); + + if (!task_spawn(fname, argv)) + printf(NAME ": Error spawning taskdump.\n", fname); +} + +int main(int argc, char *argv[]) +{ + printf(NAME ": Task Monitoring Service\n"); + + if (event_subscribe(EVENT_FAULT, 0) != EOK) { + printf(NAME ": Error registering fault notifications.\n"); + return -1; + } + + async_set_interrupt_received(fault_event); + async_manager(); + + return 0; +} + +/** @} + */