Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

input: Add the keycode translation tables separately

Browse source 
Require the caller to add the keycode translation tables separately so that
it can select which ones to use. In a later patch we will add the option to
add German tables.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2015-10-18 21:17:13 -06:00
parent 92778b2784
commit 66877b0f5f
5 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
board/kosagi/novena/novena.c
View file

@ -88,6 +88,7 @@ int drv_keyboard_init(void)
debug("%s: Cannot set up input\n", __func__);
return -1;
}
input_add_tables(&button_input);
button_input.read_keys = novena_gpio_button_read_keys;
error = input_stdio_register(&dev);

1
drivers/input/cros_ec_keyb.c
View file

@ -255,6 +255,7 @@ int drv_keyboard_init(void)
return -1;
}
config.input.read_keys = cros_ec_kbc_check;
input_add_tables(&config.input);
memset(&dev, '\0', sizeof(dev));
strcpy(dev.name, "cros-ec-keyb");

26
drivers/input/input.c
View file

@ -457,19 +457,27 @@ void input_set_delays(struct input_config *config, int repeat_delay_ms,
config->repeat_rate_ms = repeat_rate_ms;
}
int input_add_tables(struct input_config *config)
{
int ret;
ret = input_add_table(config, -1, -1,
kbd_plain_xlate, ARRAY_SIZE(kbd_plain_xlate));
if (ret)
return ret;
ret = input_add_table(config, KEY_LEFTSHIFT, KEY_RIGHTSHIFT,
kbd_shift_xlate, ARRAY_SIZE(kbd_shift_xlate));
if (ret)
return ret;
return input_add_table(config, KEY_LEFTCTRL, KEY_RIGHTCTRL,
kbd_ctrl_xlate, ARRAY_SIZE(kbd_ctrl_xlate));
}
int input_init(struct input_config *config, int leds)
{
memset(config, '\0', sizeof(*config));
config->leds = leds;
if (input_add_table(config, -1, -1,
kbd_plain_xlate, ARRAY_SIZE(kbd_plain_xlate)) ||
input_add_table(config, KEY_LEFTSHIFT, KEY_RIGHTSHIFT,
kbd_shift_xlate, ARRAY_SIZE(kbd_shift_xlate)) ||
input_add_table(config, KEY_LEFTCTRL, KEY_RIGHTCTRL,
kbd_ctrl_xlate, ARRAY_SIZE(kbd_ctrl_xlate))) {
debug("%s: Could not add modifier tables\n", __func__);
return -ENOSPC;
}
return 0;
}

1
drivers/input/tegra-kbc.c
View file

@ -355,6 +355,7 @@ int drv_keyboard_init(void)
return -1;
}
config.input.read_keys = tegra_kbc_check;
input_add_tables(input);
memset(&dev, '\0', sizeof(dev));
strcpy(dev.name, "tegra-kbc");

10
include/input.h
View file

@ -122,6 +122,16 @@ int input_stdio_register(struct stdio_dev *dev);
void input_set_delays(struct input_config *config, int repeat_delay_ms,
int repeat_rate_ms);
/**
* Set up the key map tables
*
* This must be called after input_init() or keycode decoding will not work.
*
* @param config Input state
* @return 0 if ok, -1 on error
*/
int input_add_tables(struct input_config *config);
/**
* Set up the input handler with basic key maps.
*