Index: uspace/drv/char/xtkbd/Makefile =================================================================== --- uspace/drv/char/xtkbd/Makefile (revision 4d8e2033afec18bef4d5ecfc1945817bf600c597) +++ uspace/drv/char/xtkbd/Makefile (revision 4d8e2033afec18bef4d5ecfc1945817bf600c597) @@ -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 = xtkbd + +SOURCES = \ + main.c \ + xtkbd.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/char/xtkbd/main.c =================================================================== --- uspace/drv/char/xtkbd/main.c (revision 4d8e2033afec18bef4d5ecfc1945817bf600c597) +++ uspace/drv/char/xtkbd/main.c (revision 4d8e2033afec18bef4d5ecfc1945817bf600c597) @@ -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 "xtkbd.h" + +#define NAME "xtkbd" + +static int xt_kbd_add(ddf_dev_t *device); + +static driver_ops_t kbd_driver_ops = { + .dev_add = xt_kbd_add, +}; + +static driver_t kbd_driver = { + .name = NAME, + .driver_ops = &kbd_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 XT keyboard driver.\n"); + ddf_log_init(NAME, LVL_DEBUG2); + return ddf_driver_main(&kbd_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 xt_kbd_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 + + xt_kbd_t *kbd = ddf_dev_data_alloc(device, sizeof(xt_kbd_t)); + int ret = (kbd == NULL) ? ENOMEM : EOK; + CHECK_RET_RETURN(ret, "Failed to allocate XT/KBD driver instance.\n"); + + ret = xt_kbd_init(kbd, device); + CHECK_RET_RETURN(ret, + "Failed to initialize XT_KBD driver: %s.\n", str_error(ret)); + + ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").\n", + device->name, device->handle); + return EOK; +} +/** + * @} + */ Index: uspace/drv/char/xtkbd/xtkbd.c =================================================================== --- uspace/drv/char/xtkbd/xtkbd.c (revision 4d8e2033afec18bef4d5ecfc1945817bf600c597) +++ uspace/drv/char/xtkbd/xtkbd.c (revision 4d8e2033afec18bef4d5ecfc1945817bf600c597) @@ -0,0 +1,89 @@ +/* + * 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 "xtkbd.h" + +static int polling(void *); + +int xt_kbd_init(xt_kbd_t *kbd, ddf_dev_t *dev) +{ + assert(kbd); + assert(dev); + kbd->input_sess = NULL; + kbd->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE, + dev->handle, IPC_FLAG_BLOCKING); + if (!kbd->parent_sess) + return ENOMEM; + + kbd->kbd_fun = ddf_fun_create(dev, fun_exposed, "kbd"); + if (!kbd->kbd_fun) { + async_hangup(kbd->parent_sess); + return ENOMEM; + } + + const int ret = ddf_fun_bind(kbd->kbd_fun); + if (ret != EOK) { + async_hangup(kbd->parent_sess); + ddf_fun_destroy(kbd->kbd_fun); + return ENOMEM; + } + + kbd->polling_fibril = fibril_create(polling, kbd); + if (!kbd->polling_fibril) { + async_hangup(kbd->parent_sess); + ddf_fun_unbind(kbd->kbd_fun); + ddf_fun_destroy(kbd->kbd_fun); + return ENOMEM; + } + fibril_add_ready(kbd->polling_fibril); + return EOK; +} +/*----------------------------------------------------------------------------*/ +int polling(void *arg) +{ + assert(arg); + xt_kbd_t *kbd = arg; + + assert(kbd->parent_sess); + while (1) { + uint8_t code = 0; + ssize_t size = char_dev_read(kbd->parent_sess, &code, 1); + ddf_msg(LVL_DEBUG, "Got scancode: %hhx, size: %zd", code, size); + } +} Index: uspace/drv/char/xtkbd/xtkbd.h =================================================================== --- uspace/drv/char/xtkbd/xtkbd.h (revision 4d8e2033afec18bef4d5ecfc1945817bf600c597) +++ uspace/drv/char/xtkbd/xtkbd.h (revision 4d8e2033afec18bef4d5ecfc1945817bf600c597) @@ -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 *kbd_fun; + async_sess_t *parent_sess; + async_sess_t *input_sess; + fid_t polling_fibril; +} xt_kbd_t; + +int xt_kbd_init(xt_kbd_t *, ddf_dev_t *); + +#endif +/** + * @} + */ Index: uspace/drv/char/xtkbd/xtkbd.ma =================================================================== --- uspace/drv/char/xtkbd/xtkbd.ma (revision 4d8e2033afec18bef4d5ecfc1945817bf600c597) +++ uspace/drv/char/xtkbd/xtkbd.ma (revision 4d8e2033afec18bef4d5ecfc1945817bf600c597) @@ -0,0 +1,1 @@ +100 xtkbd