input: Separate out keyboard repeat/delay from init

It is inconvenient to have to specify the keyboard repeat and delay at
init time if it is not yet available, so move this into a separate
function.

Some drivers will want to do this when their keyboard init routine
is actually called.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 4eadd773b4f63d60c47eb0201c1bd231eb1aa4d5..5b2b4b0714d8b0d1761601e4d8a1f25b5a4b8de9 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -356,7 +356,8 @@ int input_send_keycodes(struct input_config *config,
                 * insert another character if we later realise that we
                 * have missed a repeat slot.
                 */
-               is_repeat = (int)get_timer(config->next_repeat_ms) >= 0;
+               is_repeat = config->repeat_rate_ms &&
+                       (int)get_timer(config->next_repeat_ms) >= 0;
                if (!is_repeat)
                        return 0;
        }
@@ -392,13 +393,17 @@ int input_add_table(struct input_config *config, int left_keycode,
        return 0;
 }
 
-int input_init(struct input_config *config, int leds, int repeat_delay_ms,
+void input_set_delays(struct input_config *config, int repeat_delay_ms,
               int repeat_rate_ms)
 {
-       memset(config, '\0', sizeof(*config));
-       config->leds = leds;
        config->repeat_delay_ms = repeat_delay_ms;
        config->repeat_rate_ms = repeat_rate_ms;
+}
+
+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,

diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index f164791bee6128fcf0b3bce5ec55cfb1db916ee6..9a309421f04f91a01e3f10e8a9b75d1d72024142 100644 (file)
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -321,6 +321,8 @@ static int init_tegra_keyboard(void)
                debug("%s: No keyboard register found\n", __func__);
                return -1;
        }
+       input_set_delays(&config.input, KBC_REPEAT_DELAY_MS,
+                       KBC_REPEAT_RATE_MS);
 
        /* Decode the keyboard matrix information (16 rows, 8 columns) */
        if (key_matrix_init(&config.matrix, 16, 8)) {
@@ -356,8 +358,7 @@ int drv_keyboard_init(void)
 {
        struct stdio_dev dev;
 
-       if (input_init(&config.input, 0, KBC_REPEAT_DELAY_MS,
-                       KBC_REPEAT_RATE_MS)) {
+       if (input_init(&config.input, 0)) {
                debug("%s: Cannot set up input\n", __func__);
                return -1;
        }

diff --git a/include/input.h b/include/input.h
index 31b1ef9603263fbee76f13ffc01b7219ecdf5c79..0f4acb27f83782a70d1e5aa75c3782fffe7d6b20 100644 (file)
--- a/include/input.h
+++ b/include/input.h
@@ -125,17 +125,23 @@ int input_getc(struct input_config *config);
  */
 int input_stdio_register(struct stdio_dev *dev);
 
+/**
+ * Set up the keyboard autorepeat delays
+ *
+ * @param repeat_delay_ms      Delay before key auto-repeat starts (in ms)
+ * @param repeat_rate_ms       Delay between successive key repeats (in ms)
+ */
+void input_set_delays(struct input_config *config, int repeat_delay_ms,
+              int repeat_rate_ms);
+
 /**
  * Set up the input handler with basic key maps.
  *
  * @param config       Input state
  * @param leds         Initial LED value (INPUT_LED_ mask), 0 suggested
- * @param repeat_delay_ms      Delay before key auto-repeat starts (in ms)
- * @param repeat_rate_ms       Delay between successive key repeats (in ms)
  * @return 0 if ok, -1 on error
  */
-int input_init(struct input_config *config, int leds, int repeat_delay_ms,
-              int repeat_rate_ms);
+int input_init(struct input_config *config, int leds);
 
 #ifdef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 extern int overwrite_console(void);