input: Support the German keymap

Add support for the German keymap, taken from i8042.c. This can be selected
when the input library it initialised.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index 4a9f7243d0566e4c7072cf5285354107f64de127..babba852a2d7dcd6a02dfed4bb6d4232eb768c78 100644 (file)
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -88,7 +88,7 @@ int drv_keyboard_init(void)
                debug("%s: Cannot set up input\n", __func__);
                return -1;
        }
-       input_add_tables(&button_input);
+       input_add_tables(&button_input, false);
        button_input.read_keys = novena_gpio_button_read_keys;
 
        error = input_stdio_register(&dev);

diff --git a/drivers/input/cros_ec_keyb.c b/drivers/input/cros_ec_keyb.c
index fe5caea9470a2c88ed92dcad5b8307f014e39508..9bc4555c2eb6f8fc6343e3837526d5023a9af010 100644 (file)
--- a/drivers/input/cros_ec_keyb.c
+++ b/drivers/input/cros_ec_keyb.c
@@ -211,7 +211,7 @@ static int cros_ec_kbd_probe(struct udevice *dev)
 
        priv->input = input;
        input->dev = dev;
-       input_add_tables(input);
+       input_add_tables(input, false);
        input->read_keys = cros_ec_kbc_check;
        strcpy(sdev->name, "cros-ec-keyb");
 

diff --git a/drivers/input/input.c b/drivers/input/input.c
index fc1c45c88fe4dddaa41bfb5f635595ca59dc8ad3..ceed5a67ea8aebd52c19217912dbb4a41bbdbaff 100644 (file)
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -78,6 +78,88 @@ static unsigned char kbd_ctrl_xlate[] = {
        '\r', 0xff, '/',  '*',
 };
 
+static const uchar kbd_plain_xlate_german[] = {
+       0xff, 0x1b,  '1',  '2',  '3',  '4',  '5',  '6', /* scan 00-07 */
+        '7',  '8',  '9',  '0', 0xe1, '\'', 0x08, '\t', /* scan 08-0F */
+        'q',  'w',  'e',  'r',  't',  'z',  'u',  'i', /* scan 10-17 */
+        'o',  'p', 0x81,  '+', '\r', 0xff,  'a',  's', /* scan 18-1F */
+        'd',  'f',  'g',  'h',  'j',  'k',  'l', 0x94, /* scan 20-27 */
+       0x84,  '^', 0xff,  '#',  'y',  'x',  'c',  'v', /* scan 28-2F */
+        'b',  'n',  'm',  ',',  '.',  '-', 0xff,  '*', /* scan 30-37 */
+        ' ',  ' ', 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 38-3F */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,  '7', /* scan 40-47 */
+        '8',  '9',  '-',  '4',  '5',  '6',  '+',  '1', /* scan 48-4F */
+        '2',  '3',  '0',  ',', 0xff, 0xff,  '<', 0xff, /* scan 50-57 */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 58-5F */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 60-67 */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 68-6F */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 70-77 */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 78-7F */
+       '\r', 0xff,  '/',  '*',
+};
+
+static unsigned char kbd_shift_xlate_german[] = {
+          0xff, 0x1b,  '!',  '"', 0x15,  '$',  '%',  '&', /* scan 00-07 */
+        '/',  '(',  ')',  '=',  '?',  '`', 0x08, '\t', /* scan 08-0F */
+        'Q',  'W',  'E',  'R',  'T',  'Z',  'U',  'I', /* scan 10-17 */
+        'O',  'P', 0x9a,  '*', '\r', 0xff,  'A',  'S', /* scan 18-1F */
+        'D',  'F',  'G',  'H',  'J',  'K',  'L', 0x99, /* scan 20-27 */
+       0x8e, 0xf8, 0xff, '\'',  'Y',  'X',  'C',  'V', /* scan 28-2F */
+        'B',  'N',  'M',  ';',  ':',  '_', 0xff,  '*', /* scan 30-37 */
+        ' ',  ' ', 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 38-3F */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,  '7', /* scan 40-47 */
+        '8',  '9',  '-',  '4',  '5',  '6',  '+',  '1', /* scan 48-4F */
+        '2',  '3',  '0',  ',', 0xff, 0xff,  '>', 0xff, /* scan 50-57 */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 58-5F */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 60-67 */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 68-6F */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 70-77 */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 78-7F */
+       '\r', 0xff,  '/',  '*',
+};
+
+static unsigned char kbd_right_alt_xlate_german[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 00-07 */
+        '{',  '[',  ']',  '}', '\\', 0xff, 0xff, 0xff, /* scan 08-0F */
+        '@', 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 10-17 */
+       0xff, 0xff, 0xff,  '~', 0xff, 0xff, 0xff, 0xff, /* scan 18-1F */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 20-27 */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 28-2F */
+       0xff, 0xff, 0xe6, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 30-37 */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 38-3F */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 40-47 */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 48-4F */
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff,  '|', 0xff, /* scan 50-57 */
+};
+
+enum kbd_mask {
+       KBD_ENGLISH     = 1 << 0,
+       KBD_GERMAN      = 1 << 1,
+};
+
+static struct kbd_entry {
+       int kbd_mask;           /* Which languages this is for */
+       int left_keycode;       /* Left keycode to select this map */
+       int right_keycode;      /* Right keycode to select this map */
+       const uchar *xlate;     /* Ascii code for each keycode */
+       int num_entries;        /* Number of entries in xlate */
+} kbd_entry[] = {
+       { KBD_ENGLISH, -1, -1,
+               kbd_plain_xlate, ARRAY_SIZE(kbd_plain_xlate) },
+       { KBD_GERMAN, -1, -1,
+               kbd_plain_xlate_german, ARRAY_SIZE(kbd_plain_xlate_german) },
+       { KBD_ENGLISH, KEY_LEFTSHIFT, KEY_RIGHTSHIFT,
+               kbd_shift_xlate, ARRAY_SIZE(kbd_shift_xlate) },
+       { KBD_GERMAN, KEY_LEFTSHIFT, KEY_RIGHTSHIFT,
+               kbd_shift_xlate_german, ARRAY_SIZE(kbd_shift_xlate_german) },
+       { KBD_ENGLISH | KBD_GERMAN, KEY_LEFTCTRL, KEY_RIGHTCTRL,
+               kbd_ctrl_xlate, ARRAY_SIZE(kbd_ctrl_xlate) },
+       { KBD_GERMAN, -1, KEY_RIGHTALT,
+               kbd_right_alt_xlate_german,
+               ARRAY_SIZE(kbd_right_alt_xlate_german) },
+       {},
+};
+
 /*
  * Scan key code to ANSI 3.64 escape sequence table.  This table is
  * incomplete in that it does not include all possible extra keys.
@@ -500,21 +582,24 @@ void input_allow_repeats(struct input_config *config, bool allow_repeats)
        config->allow_repeats = allow_repeats;
 }
 
-int input_add_tables(struct input_config *config)
+int input_add_tables(struct input_config *config, bool german)
 {
+       struct kbd_entry *entry;
+       int mask;
        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));
+       mask = german ? KBD_GERMAN : KBD_ENGLISH;
+       for (entry = kbd_entry; entry->kbd_mask; entry++) {
+               if (!(mask & entry->kbd_mask))
+                       continue;
+               ret = input_add_table(config, entry->left_keycode,
+                                     entry->right_keycode, entry->xlate,
+                                     entry->num_entries);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
 }
 
 int input_init(struct input_config *config, int leds)

diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c
index a7137f1d9347f9e0bf53ab93d89fdf024d0d0186..951cbb4481b4a9a2ad98a7d65386117196be12c9 100644 (file)
--- a/drivers/input/tegra-kbc.c
+++ b/drivers/input/tegra-kbc.c
@@ -326,7 +326,7 @@ static int tegra_kbd_probe(struct udevice *dev)
        priv->input = input;
        input->dev = dev;
        input->read_keys = tegra_kbc_check;
-       input_add_tables(input);
+       input_add_tables(input, false);
        strcpy(sdev->name, "tegra-kbc");
        ret = input_stdio_register(sdev);
        if (ret) {

diff --git a/include/input.h b/include/input.h
index e56f5000906bdc607fb45091f1eb003822b07116..c1af259e265adb646d1e86b4d0f392d2c8897f6f 100644 (file)
--- a/include/input.h
+++ b/include/input.h
@@ -167,9 +167,10 @@ void input_allow_repeats(struct input_config *config, bool allow_repeats);
  * This must be called after input_init() or keycode decoding will not work.
  *
  * @param config       Input state
+ * @param german       true to use German keyboard layout, false for US
  * @return 0 if ok, -1 on error
  */
-int input_add_tables(struct input_config *config);
+int input_add_tables(struct input_config *config, bool german);
 
 /**
  * Set up the input handler with basic key maps.