Commit 66877b0f authored by Simon Glass's avatar Simon Glass
Browse files

input: Add the keycode translation tables separately



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: default avatarSimon Glass <sjg@chromium.org>
Reviewed-by: default avatarBin Meng <bmeng.cn@gmail.com>
parent 92778b27
......@@ -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);
......
......@@ -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");
......
......@@ -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;
}
......
......@@ -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");
......
......@@ -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.
*
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment