Index: uspace/srv/hid/input/include/gsp.h =================================================================== --- uspace/srv/hid/input/include/gsp.h (revision 5f8829315f6bebf5769560deb1bd34bc914628c4) +++ uspace/srv/hid/input/include/gsp.h (revision 5f8829315f6bebf5769560deb1bd34bc914628c4) @@ -0,0 +1,84 @@ +/* + * 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 inputgen generic + * @brief Generic scancode parser. + * @ingroup input + * @{ + */ +/** @file + */ + +#ifndef KBD_GSP_H_ +#define KBD_GSP_H_ + +#include + +enum { + GSP_END = -1, /**< Terminates a sequence. */ + GSP_DEFAULT = -2 /**< Wildcard, catches unhandled cases. */ +}; + +/** Scancode parser description */ +typedef struct { + /** Transition table, (state, input) -> (state, output) */ + hash_table_t trans; + + /** Number of states */ + int states; +} gsp_t; + +/** Scancode parser transition. */ +typedef struct { + link_t link; /**< Link to hash table in @c gsp_t */ + + /* Preconditions */ + + int old_state; /**< State before transition */ + int input; /**< Input symbol (scancode) */ + + /* Effects */ + + int new_state; /**< State after transition */ + + /* Output emitted during transition */ + + unsigned out_mods; /**< Modifier to emit */ + unsigned out_key; /**< Keycode to emit */ +} gsp_trans_t; + +extern void gsp_init(gsp_t *); +extern int gsp_insert_defs(gsp_t *, const int *); +extern int gsp_insert_seq(gsp_t *, const int *, unsigned, unsigned); +extern int gsp_step(gsp_t *, int, int, unsigned *, unsigned *); + +#endif + +/** + * @} + */ Index: uspace/srv/hid/input/include/kbd.h =================================================================== --- uspace/srv/hid/input/include/kbd.h (revision 5f8829315f6bebf5769560deb1bd34bc914628c4) +++ uspace/srv/hid/input/include/kbd.h (revision 5f8829315f6bebf5769560deb1bd34bc914628c4) @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2006 Josef Cejka + * Copyright (c) 2011 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 inputgen generic + * @brief HelenOS input server. + * @ingroup input + * @{ + */ +/** @file + */ + +#ifndef KBD_KBD_H_ +#define KBD_KBD_H_ + +#include +#include + +#define NAME "input" +#define NAMESPACE "hid_in" + +struct kbd_port_ops; +struct kbd_ctl_ops; + +typedef struct kbd_dev { + /** Link to kbd_devs list */ + link_t kbd_devs; + + /** Path to the device (only for kbdev devices) */ + const char *dev_path; + + /** Port ops */ + struct kbd_port_ops *port_ops; + + /** Ctl ops */ + struct kbd_ctl_ops *ctl_ops; +} kbd_dev_t; + +extern bool irc_service; +extern int irc_phone; + +extern void kbd_push_scancode(kbd_dev_t *, int); +extern void kbd_push_ev(kbd_dev_t *, int, unsigned int); + +#endif + +/** + * @} + */ Index: uspace/srv/hid/input/include/kbd_ctl.h =================================================================== --- uspace/srv/hid/input/include/kbd_ctl.h (revision 5f8829315f6bebf5769560deb1bd34bc914628c4) +++ uspace/srv/hid/input/include/kbd_ctl.h (revision 5f8829315f6bebf5769560deb1bd34bc914628c4) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2011 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 inputgen generic + * @brief Keyboard controller driver interface. + * @ingroup input + * @{ + */ +/** @file + */ + +#ifndef KBD_CTL_H_ +#define KBD_CTL_H_ + +#include + +struct kbd_dev; + +typedef struct kbd_ctl_ops { + void (*parse_scancode)(int); + int (*init)(struct kbd_dev *); + void (*set_ind)(unsigned); +} kbd_ctl_ops_t; + +extern kbd_ctl_ops_t apple_ctl; +extern kbd_ctl_ops_t gxe_fb_ctl; +extern kbd_ctl_ops_t kbdev_ctl; +extern kbd_ctl_ops_t pc_ctl; +extern kbd_ctl_ops_t stty_ctl; +extern kbd_ctl_ops_t sun_ctl; + +#endif + +/** + * @} + */ + Index: uspace/srv/hid/input/include/kbd_port.h =================================================================== --- uspace/srv/hid/input/include/kbd_port.h (revision 5f8829315f6bebf5769560deb1bd34bc914628c4) +++ uspace/srv/hid/input/include/kbd_port.h (revision 5f8829315f6bebf5769560deb1bd34bc914628c4) @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2011 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 inputgen generic + * @brief Keyboard port driver interface. + * @ingroup input + * @{ + */ +/** @file + */ + +#ifndef KBD_PORT_H_ +#define KBD_PORT_H_ + +#include + +struct kbd_dev; + +typedef struct kbd_port_ops { + int (*init)(struct kbd_dev *); + void (*yield)(void); + void (*reclaim)(void); + void (*write)(uint8_t); +} kbd_port_ops_t; + +extern kbd_port_ops_t adb_port; +extern kbd_port_ops_t chardev_port; +extern kbd_port_ops_t dummy_port; +extern kbd_port_ops_t gxemul_port; +extern kbd_port_ops_t msim_port; +extern kbd_port_ops_t niagara_port; +extern kbd_port_ops_t ns16550_port; +extern kbd_port_ops_t pl050_port; +extern kbd_port_ops_t sgcn_port; +extern kbd_port_ops_t ski_port; +extern kbd_port_ops_t z8530_port; + +#endif + +/** + * @} + */ + Index: uspace/srv/hid/input/include/layout.h =================================================================== --- uspace/srv/hid/input/include/layout.h (revision 5f8829315f6bebf5769560deb1bd34bc914628c4) +++ uspace/srv/hid/input/include/layout.h (revision 5f8829315f6bebf5769560deb1bd34bc914628c4) @@ -0,0 +1,56 @@ +/* + * 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 inputgen generic + * @brief Keyboard layout interface. + * @ingroup input + * @{ + */ +/** @file + */ + +#ifndef KBD_LAYOUT_H_ +#define KBD_LAYOUT_H_ + +#include +#include + +typedef struct { + void (*reset)(void); + wchar_t (*parse_ev)(kbd_event_t *); +} layout_op_t; + +extern layout_op_t us_qwerty_op; +extern layout_op_t us_dvorak_op; +extern layout_op_t cz_op; + +#endif + +/** + * @} + */ Index: uspace/srv/hid/input/include/stroke.h =================================================================== --- uspace/srv/hid/input/include/stroke.h (revision 5f8829315f6bebf5769560deb1bd34bc914628c4) +++ uspace/srv/hid/input/include/stroke.h (revision 5f8829315f6bebf5769560deb1bd34bc914628c4) @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2011 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 inputgen generic + * @brief Generic scancode parser. + * @ingroup input + * @{ + */ +/** @file + */ + +#ifndef KBD_STROKE_H_ +#define KBD_STROKE_H_ + +#include + +extern void stroke_sim(kbd_dev_t *, unsigned, unsigned); + +#endif + +/** + * @} + */ +