Changeset 1875a0c in mainline for uspace/srv/hid/input/ctl


Ignore:
Timestamp:
2011-06-21T19:10:20Z (14 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
022d9f67
Parents:
a9d85df
Message:

input server improvements

  • integrate legacy port mouse drivers (PS/2, ADB) into the input server (to be on par with the legacy keyboard drivers)
  • create generic port/protocol layers for the mouse in the input server
  • rename the "hid_in" namespace to "hid" namespace (hid_in/input was rather redundant)
  • rename the mouse event IPC messages to be more consistent with the keyboard event messages
  • rename input server ops structure members to be more generic (parse_scancode → parse)
  • cstyle changes (newlines, comments, printouts)
Location:
uspace/srv/hid/input/ctl
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    ra9d85df r1875a0c  
    3333/**
    3434 * @file
    35  * @brief       Apple ADB keyboard controller driver.
     35 * @brief Apple ADB keyboard controller driver.
    3636 */
    3737
    … …  
    4242#include <kbd_port.h>
    4343
    44 static void apple_ctl_parse_scancode(int);
     44static void apple_ctl_parse(sysarg_t);
    4545static int apple_ctl_init(kbd_dev_t *);
    46 static void apple_ctl_set_ind(kbd_dev_t *, unsigned);
     46static void apple_ctl_set_ind(kbd_dev_t *, unsigned int);
    4747
    4848kbd_ctl_ops_t apple_ctl = {
    49         .parse_scancode = apple_ctl_parse_scancode,
     49        .parse = apple_ctl_parse,
    5050        .init = apple_ctl_init,
    5151        .set_ind = apple_ctl_set_ind
    … …  
    6464}
    6565
    66 static void apple_ctl_parse_scancode(int scancode)
     66static void apple_ctl_parse(sysarg_t scancode)
    6767{
    6868        kbd_event_type_t type;
    6969        unsigned int key;
    7070
    71         if (scancode < 0 || scancode >= 0x100)
     71        if (scancode >= 0x100)
    7272                return;
    7373
    … …  
    8181        key = scanmap[scancode];
    8282        if (key != 0)
    83                 kbd_push_ev(kbd_dev, type, key);
     83                kbd_push_event(kbd_dev, type, key);
    8484}
    8585

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

    ra9d85df r1875a0c  
    4444#include <stroke.h>
    4545
    46 static void gxe_fb_ctl_parse_scancode(int);
     46static void gxe_fb_ctl_parse(sysarg_t);
    4747static int gxe_fb_ctl_init(kbd_dev_t *);
    48 static void gxe_fb_ctl_set_ind(kbd_dev_t *, unsigned);
     48static void gxe_fb_ctl_set_ind(kbd_dev_t *, unsigned int);
    4949
    5050kbd_ctl_ops_t gxe_fb_ctl = {
    51         .parse_scancode = gxe_fb_ctl_parse_scancode,
     51        .parse = gxe_fb_ctl_parse,
    5252        .init = gxe_fb_ctl_init,
    5353        .set_ind = gxe_fb_ctl_set_ind
    … …  
    229229}
    230230
    231 static void gxe_fb_ctl_parse_scancode(int scancode)
     231static void gxe_fb_ctl_parse(sysarg_t scancode)
    232232{
    233233        unsigned mods, key;

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

    ra9d85df r1875a0c  
    5353
    5454static int kbdev_ctl_init(kbd_dev_t *);
    55 static void kbdev_ctl_set_ind(kbd_dev_t *, unsigned);
     55static void kbdev_ctl_set_ind(kbd_dev_t *, unsigned int);
    5656
    5757static void kbdev_callback_conn(ipc_callid_t, ipc_call_t *, void *arg);
    5858
    5959kbd_ctl_ops_t kbdev_ctl = {
    60         .parse_scancode = NULL,
     60        .parse = NULL,
    6161        .init = kbdev_ctl_init,
    6262        .set_ind = kbdev_ctl_set_ind
    … …  
    116116        sess = fd_session(EXCHANGE_SERIALIZE, fd);
    117117        if (sess == NULL) {
    118                 printf(NAME ": Failed starting session with '%s'\n", pathname);
     118                printf("%s: Failed starting session with '%s'\n", NAME, pathname);
    119119                close(fd);
    120120                return -1;
    … …  
    123123        kbdev = kbdev_new(kdev);
    124124        if (kbdev == NULL) {
    125                 printf(NAME ": Failed allocating device structure for '%s'.\n",
    126                     pathname);
     125                printf("%s: Failed allocating device structure for '%s'.\n",
     126                    NAME, pathname);
    127127                return -1;
    128128        }
    … …  
    133133        exch = async_exchange_begin(sess);
    134134        if (exch == NULL) {
    135                 printf(NAME ": Failed starting exchange with '%s'.\n", pathname);
     135                printf("%s: Failed starting exchange with '%s'.\n", NAME, pathname);
    136136                kbdev_destroy(kbdev);
    137137                return -1;
    … …  
    140140        rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn, kbdev);
    141141        if (rc != EOK) {
    142                 printf(NAME ": Failed creating callback connection from '%s'.\n",
    143                     pathname);
     142                printf("%s: Failed creating callback connection from '%s'.\n",
     143                    NAME, pathname);
    144144                async_exchange_end(exch);
    145145                kbdev_destroy(kbdev);
    … …  
    193193                        type = IPC_GET_ARG1(call);
    194194                        key = IPC_GET_ARG2(call);
    195                         kbd_push_ev(kbdev->kbd_dev, type, key);
     195                        kbd_push_event(kbdev->kbd_dev, type, key);
    196196                        break;
    197197                default:

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

    ra9d85df r1875a0c  
    4343#include <gsp.h>
    4444
    45 static void pc_ctl_parse_scancode(int);
     45static void pc_ctl_parse(sysarg_t);
    4646static int pc_ctl_init(kbd_dev_t *);
    47 static void pc_ctl_set_ind(kbd_dev_t *, unsigned);
     47static void pc_ctl_set_ind(kbd_dev_t *, unsigned int);
    4848
    4949kbd_ctl_ops_t pc_ctl = {
    50         .parse_scancode = pc_ctl_parse_scancode,
     50        .parse = pc_ctl_parse,
    5151        .init = pc_ctl_init,
    5252        .set_ind = pc_ctl_set_ind
    … …  
    215215}
    216216
    217 static void pc_ctl_parse_scancode(int scancode)
     217static void pc_ctl_parse(sysarg_t scancode)
    218218{
    219219        kbd_event_type_t type;
    … …  
    257257        }
    258258
    259         if ((scancode < 0) || ((size_t) scancode >= map_length))
     259        if ((size_t) scancode >= map_length)
    260260                return;
    261261
    262262        key = map[scancode];
    263263        if (key != 0)
    264                 kbd_push_ev(kbd_dev, type, key);
     264                kbd_push_event(kbd_dev, type, key);
    265265}
    266266

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

    ra9d85df r1875a0c  
    3333/**
    3434 * @file
    35  * @brief       Serial TTY-like keyboard controller driver.
     35 * @brief Serial TTY-like keyboard controller driver.
    3636 */
    3737
    … …  
    4343#include <stroke.h>
    4444
    45 static void stty_ctl_parse_scancode(int);
     45static void stty_ctl_parse(sysarg_t);
    4646static int stty_ctl_init(kbd_dev_t *);
    47 static void stty_ctl_set_ind(kbd_dev_t *, unsigned);
     47static void stty_ctl_set_ind(kbd_dev_t *, unsigned int);
    4848
    4949kbd_ctl_ops_t stty_ctl = {
    50         .parse_scancode = stty_ctl_parse_scancode,
     50        .parse = stty_ctl_parse,
    5151        .init = stty_ctl_init,
    5252        .set_ind = stty_ctl_set_ind
    … …  
    228228}
    229229
    230 static void stty_ctl_parse_scancode(int scancode)
     230static void stty_ctl_parse(sysarg_t scancode)
    231231{
    232232        unsigned mods, key;

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

    ra9d85df r1875a0c  
    3434/**
    3535 * @file
    36  * @brief       Sun keyboard controller driver.
     36 * @brief Sun keyboard controller driver.
    3737 */
    3838
    … …  
    4343#include <kbd_port.h>
    4444
    45 static void sun_ctl_parse_scancode(int);
     45static void sun_ctl_parse(sysarg_t);
    4646static int sun_ctl_init(kbd_dev_t *);
    47 static void sun_ctl_set_ind(kbd_dev_t *, unsigned);
     47static void sun_ctl_set_ind(kbd_dev_t *, unsigned int);
    4848
    4949kbd_ctl_ops_t sun_ctl = {
    50         .parse_scancode = sun_ctl_parse_scancode,
     50        .parse = sun_ctl_parse,
    5151        .init = sun_ctl_init,
    5252        .set_ind = sun_ctl_set_ind
    … …  
    6666}
    6767
    68 static void sun_ctl_parse_scancode(int scancode)
     68static void sun_ctl_parse(sysarg_t scancode)
    6969{
    7070        kbd_event_type_t type;
    7171        unsigned int key;
    7272
    73         if (scancode < 0 || scancode >= 0x100)
     73        if (scancode >= 0x100)
    7474                return;
    7575
    … …  
    8686        key = scanmap_simple[scancode];
    8787        if (key != 0)
    88                 kbd_push_ev(kbd_dev, type, key);
     88                kbd_push_event(kbd_dev, type, key);
    8989}
    9090
Note: See TracChangeset for help on using the changeset viewer.