Changeset 5f88293 in mainline


Ignore:
Timestamp:
2011-06-12T15:44:38Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
60e5a856
Parents:
af897ff0
Message:

Rename 'kbd' server to 'input' server.

Files:
7 edited
29 moved

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    raf897ff0 r5f88293  
    8686RD_SRVS_ESSENTIAL = \
    8787        $(USPACE_PATH)/srv/hid/fb/fb \
    88         $(USPACE_PATH)/srv/hid/kbd/kbd \
     88        $(USPACE_PATH)/srv/hid/input/input \
    8989        $(USPACE_PATH)/srv/hid/console/console \
    9090        $(USPACE_PATH)/srv/fs/devfs/devfs

  • uspace/Makefile

    raf897ff0 r5f88293  
    8585        srv/hid/s3c24xx_ts \
    8686        srv/hid/fb \
    87         srv/hid/kbd \
     87        srv/hid/input \
    8888        srv/hw/char/i8042 \
    8989        srv/hw/char/s3c24xx_uart \

  • uspace/app/init/init.c

    raf897ff0 r5f88293  
    280280       
    281281        spawn("/srv/fb");
    282         spawn("/srv/kbd");
    283         console("hid_in/kbd");
     282        spawn("/srv/input");
     283        console("hid_in/input");
    284284       
    285285        spawn("/srv/clip");

  • uspace/drv/usbhid/kbd/kbddev.c

    raf897ff0 r5f88293  
    4141#include <io/keycode.h>
    4242#include <io/console.h>
    43 #include <ipc/kbd.h>
     43#include <ipc/kbdev.h>
    4444#include <async.h>
    4545#include <async_obsolete.h>
    … …  
    303303        }
    304304       
    305         async_obsolete_msg_2(kbd_dev->console_phone, KBD_EVENT, type, key);
     305        async_obsolete_msg_2(kbd_dev->console_phone, KBDEV_EVENT, type, key);
    306306}
    307307

  • uspace/drv/usbhid/mouse/mousedev.c

    raf897ff0 r5f88293  
    4747#include <io/console.h>
    4848
    49 #include <ipc/kbd.h>
     49#include <ipc/kbdev.h>
    5050#include <io/keycode.h>
    5151
    … …  
    219219        for (i = 0; i < count * 3; ++i) {
    220220                usb_log_debug2("Sending key %d to the console\n", ev.key);
    221                 async_obsolete_msg_4(mouse_dev->wheel_phone, KBD_EVENT, ev.type,
     221                async_obsolete_msg_4(mouse_dev->wheel_phone, KBDEV_EVENT, ev.type,
    222222                    ev.key, ev.mods, ev.c);
    223223                // send key release right away
    224                 async_obsolete_msg_4(mouse_dev->wheel_phone, KBD_EVENT, KEY_RELEASE,
     224                async_obsolete_msg_4(mouse_dev->wheel_phone, KBDEV_EVENT, KEY_RELEASE,
    225225                    ev.key, ev.mods, ev.c);
    226226        }

  • uspace/drv/usbhid/multimedia/multimedia.c

    raf897ff0 r5f88293  
    5050#include <str_error.h>
    5151
    52 #include <ipc/kbd.h>
     52#include <ipc/kbdev.h>
    5353#include <io/console.h>
    5454
    … …  
    162162        }
    163163       
    164         async_obsolete_msg_4(multim_dev->console_phone, KBD_EVENT, ev.type, ev.key,
     164        async_obsolete_msg_4(multim_dev->console_phone, KBDEV_EVENT, ev.type, ev.key,
    165165            ev.mods, ev.c);
    166166}

  • uspace/lib/c/include/ipc/input.h

    raf897ff0 r5f88293  
    11/*
    2  * Copyright (c) 2009 Jiri Svoboda
     2 * Copyright (c) 2011 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup kbdgen generic
    30  * @brief HelenOS generic uspace keyboard handler.
    31  * @ingroup kbd
     29/** @addtogroup libcipc
    3230 * @{
    3331 */
    … …  
    3533 */
    3634
    37 #ifndef LIBC_IPC_KBD_H_
    38 #define LIBC_IPC_KBD_H_
     35#ifndef LIBC_IPC_INPUT_H_
     36#define LIBC_IPC_INPUT_H_
    3937
    4038#include <ipc/common.h>
    41 #include <ipc/dev_iface.h>
    4239
    4340typedef enum {
    44         KBD_YIELD = DEV_FIRST_CUSTOM_METHOD,
    45         KBD_RECLAIM
    46 } kbd_request_t;
     41        INPUT_YIELD = IPC_FIRST_USER_METHOD,
     42        INPUT_RECLAIM
     43} input_request_t;
    4744
    4845typedef enum {
    49         KBD_EVENT = IPC_FIRST_USER_METHOD
    50 } kbd_notif_t;
     46        INPUT_EVENT = IPC_FIRST_USER_METHOD
     47} input_notif_t;
    5148
    5249#endif

  • uspace/srv/hid/console/console.c

    raf897ff0 r5f88293  
    3434
    3535#include <libc.h>
    36 #include <ipc/kbd.h>
     36#include <ipc/input.h>
    3737#include <io/keycode.h>
    3838#include <ipc/mouse.h>
    … …  
    157157static void kbd_yield(void)
    158158{
    159         async_obsolete_req_0_0(kbd_phone, KBD_YIELD);
     159        async_obsolete_req_0_0(kbd_phone, INPUT_YIELD);
    160160}
    161161
    162162static void kbd_reclaim(void)
    163163{
    164         async_obsolete_req_0_0(kbd_phone, KBD_RECLAIM);
     164        async_obsolete_req_0_0(kbd_phone, INPUT_RECLAIM);
    165165}
    166166
    … …  
    444444               
    445445                switch (IPC_GET_IMETHOD(call)) {
    446                 case KBD_EVENT:
     446                case INPUT_EVENT:
    447447                        /* Got event from keyboard driver. */
    448448                        retval = 0;

  • uspace/srv/hid/input/Makefile

    raf897ff0 r5f88293  
    3535
    3636EXTRA_CFLAGS = -Iinclude
    37 BINARY = kbd
     37BINARY = input
    3838
    3939-include $(COMMON_MAKEFILE)
    … …  
    4444
    4545SOURCES = \
    46         generic/kbd.c \
     46        generic/input.c \
    4747        genarch/gsp.c \
    4848        genarch/stroke.c \

  • uspace/srv/hid/input/ctl/apple.c

    raf897ff0 r5f88293  
    2828
    2929/** @addtogroup kbd_ctl
    30  * @ingroup kbd
     30 * @ingroup input
    3131 * @{
    3232 */

  • uspace/srv/hid/input/ctl/gxe_fb.c

    raf897ff0 r5f88293  
    2828
    2929/** @addtogroup kbd_ctl
    30  * @ingroup kbd
     30 * @ingroup input
    3131 * @{
    3232 */

  • uspace/srv/hid/input/ctl/pc.c

    raf897ff0 r5f88293  
    2828
    2929/** @addtogroup kbd_ctl
    30  * @ingroup kbd
     30 * @ingroup input
    3131 * @{
    3232 */

  • uspace/srv/hid/input/ctl/stty.c

    raf897ff0 r5f88293  
    2828
    2929/** @addtogroup kbd_ctl
    30  * @ingroup kbd
     30 * @ingroup input
    3131 * @{
    3232 */

  • uspace/srv/hid/input/ctl/sun.c

    raf897ff0 r5f88293  
    2929
    3030/** @addtogroup kbd_ctl
    31  * @ingroup kbd
     31 * @ingroup input
    3232 * @{
    3333 */

  • uspace/srv/hid/input/genarch/gsp.c

    raf897ff0 r5f88293  
    2929/**
    3030 * @addtogroup kbdgen generic
    31  * @ingroup  kbd
     31 * @ingroup  input
    3232 * @{
    3333 */

  • uspace/srv/hid/input/genarch/stroke.c

    raf897ff0 r5f88293  
    2727 */
    2828
    29 /** @addtogroup kbd
     29/** @addtogroup input
    3030 * @{
    3131 */

  • uspace/srv/hid/input/generic/input.c

    raf897ff0 r5f88293  
    2929
    3030/**
    31  * @addtogroup kbdgen generic
    32  * @brief HelenOS generic uspace keyboard handler.
    33  * @ingroup kbd
     31 * @addtogroup inputgen generic
     32 * @brief HelenOS input server.
     33 * @ingroup input
    3434 * @{
    3535 */
    … …  
    3939#include <adt/list.h>
    4040#include <ipc/services.h>
    41 #include <ipc/kbd.h>
     41#include <ipc/input.h>
    4242#include <sysinfo.h>
    4343#include <stdio.h>
    … …  
    175175        ev.c = layout[active_layout]->parse_ev(&ev);
    176176
    177         async_obsolete_msg_4(client_phone, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
     177        async_obsolete_msg_4(client_phone, INPUT_EVENT, ev.type, ev.key, ev.mods, ev.c);
    178178}
    179179
    … …  
    208208                        retval = 0;
    209209                        break;
    210                 case KBD_YIELD:
     210                case INPUT_YIELD:
    211211                        kbd_devs_yield();
    212212                        retval = 0;
    213213                        break;
    214                 case KBD_RECLAIM:
     214                case INPUT_RECLAIM:
    215215                        kbd_devs_reclaim();
    216216                        retval = 0;
    … …  
    416416int main(int argc, char **argv)
    417417{
    418         printf("%s: HelenOS Keyboard service\n", NAME);
     418        printf("%s: HelenOS input service\n", NAME);
    419419       
    420420        sysarg_t fhc;
    … …  
    466466/**
    467467 * @}
    468  */ 
     468 */

  • uspace/srv/hid/input/include/gsp.h

    raf897ff0 r5f88293  
    2727 */
    2828
    29 /** @addtogroup kbdgen generic
     29/** @addtogroup inputgen generic
    3030 * @brief       Generic scancode parser.
    31  * @ingroup  kbd
     31 * @ingroup  input
    3232 * @{
    33  */ 
     33 */
    3434/** @file
    3535 */

  • uspace/srv/hid/input/include/kbd.h

    raf897ff0 r5f88293  
    2828 */
    2929
    30 /** @addtogroup kbdgen generic
    31  * @brief HelenOS generic uspace keyboard handler.
    32  * @ingroup kbd
     30/** @addtogroup inputgen generic
     31 * @brief HelenOS input server.
     32 * @ingroup input
    3333 * @{
    3434 */
    … …  
    4242#include <bool.h>
    4343
    44 #define NAME       "kbd"
     44#define NAME       "input"
    4545#define NAMESPACE  "hid_in"
    4646

  • uspace/srv/hid/input/include/kbd_ctl.h

    raf897ff0 r5f88293  
    2727 */
    2828
    29 /** @addtogroup kbdgen generic
    30  * @brief       HelenOS generic uspace keyboard handler.
    31  * @ingroup  kbd
     29/** @addtogroup inputgen generic
     30 * @brief       Keyboard controller driver interface.
     31 * @ingroup  input
    3232 * @{
    33  */ 
     33 */
    3434/** @file
    3535 */

  • uspace/srv/hid/input/include/kbd_port.h

    raf897ff0 r5f88293  
    2727 */
    2828
    29 /** @addtogroup kbdgen generic
    30  * @brief       HelenOS generic uspace keyboard handler.
    31  * @ingroup  kbd
     29/** @addtogroup inputgen generic
     30 * @brief       Keyboard port driver interface.
     31 * @ingroup  input
    3232 * @{
    33  */ 
     33 */
    3434/** @file
    3535 */

  • uspace/srv/hid/input/include/layout.h

    raf897ff0 r5f88293  
    2727 */
    2828
    29 /** @addtogroup kbdgen generic
    30  * @brief HelenOS generic uspace keyboard handler.
    31  * @ingroup kbd
     29/** @addtogroup inputgen generic
     30 * @brief Keyboard layout interface.
     31 * @ingroup input
    3232 * @{
    3333 */

  • uspace/srv/hid/input/include/stroke.h

    raf897ff0 r5f88293  
    2727 */
    2828
    29 /** @addtogroup kbdgen generic
     29/** @addtogroup inputgen generic
    3030 * @brief       Generic scancode parser.
    31  * @ingroup  kbd
     31 * @ingroup  input
    3232 * @{
    3333 */

  • uspace/srv/hid/input/layout/cz.c

    raf897ff0 r5f88293  
    2727 */
    2828
    29 /** @addtogroup kbd
     29/** @addtogroup input
    3030 * @brief Czech QWERTZ layout.
    3131 * @{

  • uspace/srv/hid/input/layout/us_dvorak.c

    raf897ff0 r5f88293  
    2727 */
    2828
    29 /** @addtogroup kbd
     29/** @addtogroup input
    3030 * @brief US Dvorak Simplified Keyboard layout.
    3131 * @{

  • uspace/srv/hid/input/layout/us_qwerty.c

    raf897ff0 r5f88293  
    2727 */
    2828
    29 /** @addtogroup kbd
     29/** @addtogroup input
    3030 * @brief       US QWERTY layout.
    3131 * @{
    32  */ 
     32 */
    3333
    3434#include <kbd.h>

  • uspace/srv/hid/input/port/adb.c

    raf897ff0 r5f88293  
    6363static kbd_dev_t *kbd_dev;
    6464static int dev_phone;
    65 
    66 #define NAME "kbd"
    6765
    6866static int adb_port_init(kbd_dev_t *kdev)
Note: See TracChangeset for help on using the changeset viewer.