Changeset 56ad818 in mainline for uspace/srv/hid/kbd/ctl


Ignore:
Timestamp:
2011-06-11T20:29:41Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9be360ee
Parents:
b1bdc7a4
Message:

Control keyboard ctl modules through ops structures. Always compile in
all ctl modules.

Location:
uspace/srv/hid/kbd/ctl
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    rb1bdc7a4 r56ad818  
    4242#include <kbd_port.h>
    4343
     44static void apple_ctl_parse_scancode(int scancode);
     45static int apple_ctl_init(kbd_port_ops_t *kbd_port);
     46static void apple_ctl_set_ind(unsigned mods);
     47
     48kbd_ctl_ops_t apple_ctl = {
     49        .parse_scancode = apple_ctl_parse_scancode,
     50        .init = apple_ctl_init,
     51        .set_ind = apple_ctl_set_ind
     52};
     53
    4454#define KBD_KEY_RELEASE         0x80
    4555
    4656static int scanmap[];
    4757
    48 int kbd_ctl_init(kbd_port_ops_t *kbd_port)
     58static int apple_ctl_init(kbd_port_ops_t *kbd_port)
    4959{
    5060        (void) kbd_port;
    … …  
    5262}
    5363
    54 void kbd_ctl_parse_scancode(int scancode)
     64static void apple_ctl_parse_scancode(int scancode)
    5565{
    5666        kbd_event_type_t type;
    … …  
    7282}
    7383
    74 void kbd_ctl_set_ind(unsigned mods)
     84static void apple_ctl_set_ind(unsigned mods)
    7585{
    7686        (void) mods;

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

    rb1bdc7a4 r56ad818  
    4444#include <stroke.h>
    4545
     46static void gxe_fb_ctl_parse_scancode(int scancode);
     47static int gxe_fb_ctl_init(kbd_port_ops_t *kbd_port);
     48static void gxe_fb_ctl_set_ind(unsigned mods);
     49
     50kbd_ctl_ops_t gxe_fb_ctl = {
     51        .parse_scancode = gxe_fb_ctl_parse_scancode,
     52        .init = gxe_fb_ctl_init,
     53        .set_ind = gxe_fb_ctl_set_ind
     54};
     55
    4656/** Scancode parser */
    4757static gsp_t sp;
    … …  
    5262#include <stdio.h>
    5363
    54 int seq_defs[] = {
     64static int seq_defs[] = {
    5565        /* Not shifted */
    5666
    … …  
    208218};
    209219
    210 int kbd_ctl_init(kbd_port_ops_t *kbd_port)
     220static int gxe_fb_ctl_init(kbd_port_ops_t *kbd_port)
    211221{
    212222        (void) kbd_port;
    … …  
    217227}
    218228
    219 void kbd_ctl_parse_scancode(int scancode)
     229static void gxe_fb_ctl_parse_scancode(int scancode)
    220230{
    221231        unsigned mods, key;
    … …  
    227237}
    228238
    229 void kbd_ctl_set_ind(unsigned mods)
     239static void gxe_fb_ctl_set_ind(unsigned mods)
    230240{
    231241        (void) mods;

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

    rb1bdc7a4 r56ad818  
    4343#include <gsp.h>
    4444
     45static void pc_ctl_parse_scancode(int scancode);
     46static int pc_ctl_init(kbd_port_ops_t *kbd_port);
     47static void pc_ctl_set_ind(unsigned mods);
     48
     49kbd_ctl_ops_t pc_ctl = {
     50        .parse_scancode = pc_ctl_parse_scancode,
     51        .init = pc_ctl_init,
     52        .set_ind = pc_ctl_set_ind
     53};
     54
    4555enum dec_state {
    4656        ds_s,
    … …  
    198208};
    199209
    200 int kbd_ctl_init(kbd_port_ops_t *kbd_p)
     210static int pc_ctl_init(kbd_port_ops_t *kbd_p)
    201211{
    202212        kbd_port = kbd_p;
    … …  
    205215}
    206216
    207 void kbd_ctl_parse_scancode(int scancode)
     217static void pc_ctl_parse_scancode(int scancode)
    208218{
    209219        kbd_event_type_t type;
    … …  
    255265}
    256266
    257 void kbd_ctl_set_ind(unsigned mods)
     267static void pc_ctl_set_ind(unsigned mods)
    258268{
    259269        uint8_t b;

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

    rb1bdc7a4 r56ad818  
    4343#include <stroke.h>
    4444
     45static void stty_ctl_parse_scancode(int scancode);
     46static int stty_ctl_init(kbd_port_ops_t *kbd_port);
     47static void stty_ctl_set_ind(unsigned mods);
     48
     49kbd_ctl_ops_t stty_ctl = {
     50        .parse_scancode = stty_ctl_parse_scancode,
     51        .init = stty_ctl_init,
     52        .set_ind = stty_ctl_set_ind
     53};
     54
    4555/** Scancode parser */
    4656static gsp_t sp;
    … …  
    5161#include <stdio.h>
    5262
    53 int seq_defs[] = {
     63static int seq_defs[] = {
    5464        /* Not shifted */
    5565
    … …  
    207217};
    208218
    209 int kbd_ctl_init(kbd_port_ops_t *kbd_port)
     219static int stty_ctl_init(kbd_port_ops_t *kbd_port)
    210220{
    211221        (void) kbd_port;
    … …  
    216226}
    217227
    218 void kbd_ctl_parse_scancode(int scancode)
     228static void stty_ctl_parse_scancode(int scancode)
    219229{
    220230        unsigned mods, key;
    … …  
    226236}
    227237
    228 void kbd_ctl_set_ind(unsigned mods)
     238static void stty_ctl_set_ind(unsigned mods)
    229239{
    230240        (void) mods;

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

    rb1bdc7a4 r56ad818  
    4242#include <kbd_port.h>
    4343
     44static void sun_ctl_parse_scancode(int scancode);
     45static int sun_ctl_init(kbd_port_ops_t *kbd_port);
     46static void sun_ctl_set_ind(unsigned mods);
     47
     48kbd_ctl_ops_t sun_ctl = {
     49        .parse_scancode = sun_ctl_parse_scancode,
     50        .init = sun_ctl_init,
     51        .set_ind = sun_ctl_set_ind
     52};
     53
    4454#define KBD_KEY_RELEASE         0x80
    4555#define KBD_ALL_KEYS_UP         0x7f
    … …  
    4757static int scanmap_simple[];
    4858
    49 int kbd_ctl_init(kbd_port_ops_t *kbd_port)
     59static int sun_ctl_init(kbd_port_ops_t *kbd_port)
    5060{
    5161        return 0;
    5262}
    5363
    54 void kbd_ctl_parse_scancode(int scancode)
     64static void sun_ctl_parse_scancode(int scancode)
    5565{
    5666        kbd_event_type_t type;
    … …  
    7585}
    7686
    77 void kbd_ctl_set_ind(unsigned mods)
     87static void sun_ctl_set_ind(unsigned mods)
    7888{
    7989        (void) mods;
Note: See TracChangeset for help on using the changeset viewer.