Index: uspace/drv/char/ps2mouse/Makefile =================================================================== --- uspace/drv/char/ps2mouse/Makefile (revision 2ecb5ecebc7b75664966ec79c4b0a63410a27ded) +++ uspace/drv/char/ps2mouse/Makefile (revision 2ecb5ecebc7b75664966ec79c4b0a63410a27ded) @@ -0,0 +1,38 @@ +# +# Copyright (c) 2011 Jan Vesely +# 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 = $(LIBDRV_PREFIX)/libdrv.a +EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include +BINARY = ps2mouse + +SOURCES = \ + main.c \ + ps2mouse.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/char/ps2mouse/main.c =================================================================== --- uspace/drv/char/ps2mouse/main.c (revision 2ecb5ecebc7b75664966ec79c4b0a63410a27ded) +++ uspace/drv/char/ps2mouse/main.c (revision 2ecb5ecebc7b75664966ec79c4b0a63410a27ded) @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2011 Jan Vesely + * 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 drvkbd + * @{ + */ +/** @file + * @brief XT keyboard driver + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ps2mouse.h" + +#define NAME "ps2mouse" + +static int mouse_add(ddf_dev_t *device); + +static driver_ops_t mouse_driver_ops = { + .dev_add = mouse_add, +}; + +static driver_t mouse_driver = { + .name = NAME, + .driver_ops = &mouse_driver_ops +}; + +/** Initialize global driver structures (NONE). + * + * @param[in] argc Nmber of arguments in argv vector (ignored). + * @param[in] argv Cmdline argument vector (ignored). + * @return Error code. + * + * Driver debug level is set here. + */ +int main(int argc, char *argv[]) +{ + printf(NAME ": HelenOS ps/2 mouse driver.\n"); + ddf_log_init(NAME, LVL_DEBUG2); + return ddf_driver_main(&mouse_driver); +} + +/** Initialize a new ddf driver instance of the driver + * + * @param[in] device DDF instance of the device to initialize. + * @return Error code. + */ +static int mouse_add(ddf_dev_t *device) +{ + if (!device) + return EINVAL; + +#define CHECK_RET_RETURN(ret, message...) \ +if (ret != EOK) { \ + ddf_msg(LVL_ERROR, message); \ + return ret; \ +} else (void)0 + + ps2_mouse_t *mouse = ddf_dev_data_alloc(device, sizeof(ps2_mouse_t)); + int ret = (mouse == NULL) ? ENOMEM : EOK; + CHECK_RET_RETURN(ret, "Failed to allocate mouse driver instance.\n"); + + ret = ps2_mouse_init(mouse, device); + CHECK_RET_RETURN(ret, + "Failed to initialize mouse driver: %s.\n", str_error(ret)); + + ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").\n", + device->name, device->handle); + return EOK; +} +/** + * @} + */ Index: uspace/drv/char/ps2mouse/ps2mouse.c =================================================================== --- uspace/drv/char/ps2mouse/ps2mouse.c (revision 2ecb5ecebc7b75664966ec79c4b0a63410a27ded) +++ uspace/drv/char/ps2mouse/ps2mouse.c (revision 2ecb5ecebc7b75664966ec79c4b0a63410a27ded) @@ -0,0 +1,227 @@ +/* + * Copyright (c) 2011 Jan Vesely + * 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 drvkbd + * @{ + */ +/** @file + * @brief XT keyboard driver; + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ps2mouse.h" + +#define PS2_MOUSE_OUT_INIT 0xf4 +#define PS2_MOUSE_ACK 0xfa + +#define BUFSIZE 3 + +#define X_SIGN (1 << 4) +#define Y_SIGN (1 << 5) +#define X_OVERFLOW (1 << 6) +#define Y_OVERFLOW (1 << 7) + +#define BUTTON_LEFT 0 +#define BUTTON_RIGHT 1 +#define BUTTON_MIDDLE 2 +#define BUTTON_COUNT 3 + +#define BUTTON_MASK(button) (1 << button) + +/*----------------------------------------------------------------------------*/ +static int polling_ps2(void *); +static void default_connection_handler(ddf_fun_t *fun, + ipc_callid_t icallid, ipc_call_t *icall); +/*----------------------------------------------------------------------------*/ +static ddf_dev_ops_t mouse_ops = { + .default_handler = default_connection_handler +}; +/*----------------------------------------------------------------------------*/ +int ps2_mouse_init(ps2_mouse_t *mouse, ddf_dev_t *dev) +{ + assert(mouse); + assert(dev); + mouse->input_sess = NULL; + mouse->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE, + dev->handle, IPC_FLAG_BLOCKING); + if (!mouse->parent_sess) + return ENOMEM; + + mouse->mouse_fun = ddf_fun_create(dev, fun_exposed, "mouse"); + if (!mouse->mouse_fun) { + async_hangup(mouse->parent_sess); + return ENOMEM; + } + mouse->mouse_fun->ops = &mouse_ops; + mouse->mouse_fun->driver_data = mouse; + + int ret = ddf_fun_bind(mouse->mouse_fun); + if (ret != EOK) { + async_hangup(mouse->parent_sess); + mouse->mouse_fun->driver_data = NULL; + ddf_fun_destroy(mouse->mouse_fun); + return ENOMEM; + } + + ret = ddf_fun_add_to_category(mouse->mouse_fun, "mouse"); + if (ret != EOK) { + async_hangup(mouse->parent_sess); + ddf_fun_unbind(mouse->mouse_fun); + mouse->mouse_fun->driver_data = NULL; + ddf_fun_destroy(mouse->mouse_fun); + return ENOMEM; + } + /* Enable mouse data reporting. */ + uint8_t report = PS2_MOUSE_OUT_INIT; + ssize_t size = char_dev_write(mouse->parent_sess, &report, 1); + if (size != 1) { + ddf_msg(LVL_ERROR, "Failed to write INIT.\n"); + async_hangup(mouse->parent_sess); + ddf_fun_unbind(mouse->mouse_fun); + mouse->mouse_fun->driver_data = NULL; + ddf_fun_destroy(mouse->mouse_fun); + return EIO; + } +#if 0 /* Enable this when we can guarantee that the response won't be lost. */ + size = char_dev_read(mouse->parent_sess, &report, 1); + if (size != 1 || report != PS2_MOUSE_ACK) { + ddf_msg(LVL_ERROR, "MOUSE FAILED TO ACK %hhx.\n", report); + async_hangup(mouse->parent_sess); + ddf_fun_unbind(mouse->mouse_fun); + mouse->mouse_fun->driver_data = NULL; + ddf_fun_destroy(mouse->mouse_fun); + return EIO; + } +#endif + + mouse->polling_fibril = fibril_create(polling_ps2, mouse); + if (!mouse->polling_fibril) { + async_hangup(mouse->parent_sess); + ddf_fun_unbind(mouse->mouse_fun); + mouse->mouse_fun->driver_data = NULL; + ddf_fun_destroy(mouse->mouse_fun); + return ENOMEM; + } + fibril_add_ready(mouse->polling_fibril); + return EOK; +} +/*----------------------------------------------------------------------------*/ +int polling_ps2(void *arg) +{ + assert(arg); + ps2_mouse_t *mouse = arg; + + assert(mouse->parent_sess); + bool buttons[BUTTON_COUNT] = {}; + while (1) { + + uint8_t packet[BUFSIZE] = {}; + const ssize_t size = + char_dev_read(mouse->parent_sess, packet, BUFSIZE); + + if (size != 3) { + ddf_msg(LVL_WARN, "Incorrect packet size: %zd.", size); + continue; + } + ddf_msg(LVL_DEBUG2, "Got packet: %hhx:%hhx:%hhx.", + packet[0], packet[1], packet[2]); + + async_exch_t *exch = + async_exchange_begin(mouse->input_sess); + if (!exch) { + ddf_msg(LVL_ERROR, + "Failed to create input exchange."); + continue; + } + /* Buttons */ + for (unsigned i = 0; i < BUTTON_COUNT; ++i) { + if (buttons[i] != (bool)(packet[0] & BUTTON_MASK(i))) { + buttons[i] = !buttons[i]; + async_msg_2(exch, MOUSEEV_BUTTON_EVENT, i + 1, + buttons[i]); + } + } + + const int move_x = packet[1] * ((packet[0] & X_SIGN) ? -1 : 1); + const int move_y = packet[2] * ((packet[0] & Y_SIGN) ? 1 : -1); + if (move_x != 0 || move_y != 0) { + async_msg_2(exch, MOUSEEV_MOVE_EVENT, move_x, move_y); + } + async_exchange_end(exch); + } +} +/*----------------------------------------------------------------------------*/ +void default_connection_handler(ddf_fun_t *fun, + ipc_callid_t icallid, ipc_call_t *icall) +{ + if (fun == NULL || fun->driver_data == NULL) { + ddf_msg(LVL_ERROR, "%s: Missing parameter.\n", __FUNCTION__); + async_answer_0(icallid, EINVAL); + return; + } + + const sysarg_t method = IPC_GET_IMETHOD(*icall); + ps2_mouse_t *mouse = fun->driver_data; + + switch (method) { + /* This might be ugly but async_callback_receive_start makes no + * difference for incorrect call and malloc failure. */ + case IPC_M_CONNECT_TO_ME: { + async_sess_t *sess = + async_callback_receive_start(EXCHANGE_SERIALIZE, icall); + /* Probably ENOMEM error, try again. */ + if (sess == NULL) { + ddf_msg(LVL_WARN, + "Failed to create start input session"); + async_answer_0(icallid, EAGAIN); + break; + } + if (mouse->input_sess == NULL) { + mouse->input_sess = sess; + ddf_msg(LVL_DEBUG, "Set input session"); + async_answer_0(icallid, EOK); + } else { + ddf_msg(LVL_ERROR, "Input session already set"); + async_answer_0(icallid, ELIMIT); + } + break; + } + default: + ddf_msg(LVL_ERROR, "Unknown method: %d.\n", (int)method); + async_answer_0(icallid, EINVAL); + break; + } +} Index: uspace/drv/char/ps2mouse/ps2mouse.h =================================================================== --- uspace/drv/char/ps2mouse/ps2mouse.h (revision 2ecb5ecebc7b75664966ec79c4b0a63410a27ded) +++ uspace/drv/char/ps2mouse/ps2mouse.h (revision 2ecb5ecebc7b75664966ec79c4b0a63410a27ded) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2011 Jan Vesely + * 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 drvkbd + * @{ + */ +/** @file + * @brief XT keyboard driver; + */ + +#ifndef _XT_KBD_H_ +#define _XT_KBD_H_ + +#include +#include + +typedef struct { + ddf_fun_t *mouse_fun; + async_sess_t *parent_sess; + async_sess_t *input_sess; + fid_t polling_fibril; +} ps2_mouse_t; + +int ps2_mouse_init(ps2_mouse_t *, ddf_dev_t *); + +#endif +/** + * @} + */ Index: uspace/drv/char/ps2mouse/ps2mouse.ma =================================================================== --- uspace/drv/char/ps2mouse/ps2mouse.ma (revision 2ecb5ecebc7b75664966ec79c4b0a63410a27ded) +++ uspace/drv/char/ps2mouse/ps2mouse.ma (revision 2ecb5ecebc7b75664966ec79c4b0a63410a27ded) @@ -0,0 +1,1 @@ +100 ps2mouse