Merge remote-tracking branch 'u-boot-ti/master'

[karo-tx-uboot.git] / include / input.h

diff --git a/include/input.h b/include/input.h
index 31b1ef9603263fbee76f13ffc01b7219ecdf5c79..e90bb0ba9c6c4505c90de44be5e4a37a68256ef0 100644 (file)
--- a/include/input.h
+++ b/include/input.h
@@ -84,6 +84,8 @@ struct stdio_dev;
  * @param config       Input state
  * @param keycode      List of key codes to examine
  * @param num_keycodes Number of key codes
+ * @return number of ascii characters sent, or 0 if none, or -1 for an
+ *     internal error
  */
 int input_send_keycodes(struct input_config *config, int keycode[], int count);
 
@@ -125,17 +127,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);