* add keyboard layout support to libpayload

* add a reset handler mechanism (CTRL-ALT-DEL)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3605 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in
index 61567003f06f289ea10105ed0d73ec7d6e071e25..fd585b9b46022695ae6a327bdd1f1b531b6aea2c 100644 (file)
--- a/payloads/libpayload/Config.in
+++ b/payloads/libpayload/Config.in
@@ -100,6 +100,16 @@ config PC_KEYBOARD
        bool "Allow input from a PC keyboard"
        default y
 
+config PC_KEYBOARD_LAYOUT_US
+       bool "English (US) keyboard layout"
+       depends on PC_KEYBOARD
+       default y
+
+config PC_KEYBOARD_LAYOUT_DE
+       bool "German keyboard layout"
+       depends on PC_KEYBOARD
+       default n
+
 endmenu
 
 menu "Drivers"

diff --git a/payloads/libpayload/drivers/keyboard.c b/payloads/libpayload/drivers/keyboard.c
index b33289801f8cfae46369254ae79b14a67e1150e4..944b9a66a22c21dbd82a01743d65e58be0ecf2c2 100644 (file)
--- a/payloads/libpayload/drivers/keyboard.c
+++ b/payloads/libpayload/drivers/keyboard.c
@@ -28,6 +28,7 @@
  */
 
 #include <libpayload.h>
+#include <config.h>
 #include <curses.h>
 
 #define I8042_CMD_READ_MODE  0x20
@@ -35,7 +36,18 @@
 
 #define I8042_MODE_XLATE     0x40
 
-unsigned short map[4][0x57] = {
+static void (*reset_handler)(void) = NULL;
+
+struct layout_maps {
+       char *country;
+       unsigned short map[4][0x57];
+};
+
+struct layout_maps *map;
+
+struct layout_maps keyboard_layouts[] = {
+#ifdef CONFIG_PC_KEYBOARD_LAYOUT_US
+{ .country = "us", .map = {
        { /* No modifier */
         0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
         0x37, 0x38, 0x39, 0x30, 0x2D, 0x3D, 0x08, 0x09,
@@ -88,6 +100,65 @@ unsigned short map[4][0x57] = {
         KEY_UP, KEY_NPAGE, 0x00, KEY_LEFT, 0x00, KEY_RIGHT, 0x00, KEY_END,
         KEY_DOWN, KEY_PPAGE, 0x00, KEY_DC, 0x00, 0x00, 0x00
         }
+}},
+#endif
+#ifdef CONFIG_PC_KEYBOARD_LAYOUT_DE
+{ .country = "de", .map = {
+       { /* No modifier */
+        0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
+        0x37, 0x38, 0x39, 0x30, 0x00, 0x27, 0x08, 0x09,
+        0x71, 0x77, 0x65, 0x72, 0x74, 0x7A, 0x75, 0x69,
+        0x6F, 0x70, 0x00, 0x2B, 0x0A, 0x00, 0x61, 0x73,
+        0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x00,
+        0x00, 0x5E, 0x00, 0x23, 0x79, 0x78, 0x63, 0x76,
+        0x62, 0x6E, 0x6D, 0x2C, 0x2E, 0x2D, 0x00, 0x2A,
+        0x00, 0x20, 0x00, KEY_F(1), KEY_F(2), KEY_F(3), KEY_F(4), KEY_F(5),
+        KEY_F(6), KEY_F(7), KEY_F(8), KEY_F(9), KEY_F(10), 0x00, 0x00, KEY_HOME,
+        KEY_UP, KEY_NPAGE, 0x00, KEY_LEFT, 0x00, KEY_RIGHT, 0x00, KEY_END,
+        KEY_DOWN, KEY_PPAGE, 0x00, KEY_DC, 0x00, 0x00, 0x3C
+        },
+       { /* Shift */
+        0x00, 0x1B, 0x21, 0x22, 0xA7, 0x24, 0x25, 0x26,
+        0x2F, 0x28, 0x29, 0x3D, 0x3F, 0x60, 0x08, 0x00,
+        0x51, 0x57, 0x45, 0x52, 0x54, 0x5A, 0x55, 0x49,
+        0x4F, 0x50, 0x00, 0x2A, 0x0A, 0x00, 0x41, 0x53,
+        0x44, 0x46, 0x47, 0x48, 0x4A, 0x4B, 0x4C, 0x00,
+        0x00, 0x7E, 0x00, 0x27, 0x59, 0x58, 0x43, 0x56,
+        0x42, 0x4E, 0x4D, 0x3B, 0x3A, 0x5F, 0x00, 0x2A,
+        0x00, 0x20, 0x00, KEY_F(1), KEY_F(2), KEY_F(3), KEY_F(4), KEY_F(5),
+        KEY_F(6), KEY_F(7), KEY_F(8), KEY_F(9), KEY_F(10), 0x00, 0x00, KEY_HOME,
+        KEY_UP, KEY_NPAGE, 0x00, KEY_LEFT, 0x00, KEY_RIGHT, 0x00, KEY_END,
+        KEY_DOWN, KEY_PPAGE, 0x00, KEY_DC, 0x00, 0x00, 0x3E
+        },
+       { /* ALT */
+        0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
+        0x7B, 0x5B, 0x5D, 0x7D, 0x5C, 0x3D, 0x08, 0x09,
+        0x40, 0x77, 0x65, 0x72, 0x74, 0x79, 0x75, 0x69,
+        0x6F, 0x70, 0x5B, 0x7E, 0x0A, 0x00, 0x61, 0x73,
+        0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x3B,
+        0x27, 0x60, 0x00, 0x5C, 0x7A, 0x78, 0x63, 0x76,
+        0x62, 0x6E, 0x6D, 0x2C, 0x2E, 0x2F, 0x00, 0x2A,
+        0x00, 0x20, 0x00, KEY_F(1), KEY_F(2), KEY_F(3), KEY_F(4), KEY_F(5),
+        KEY_F(6), KEY_F(7), KEY_F(8), KEY_F(9), KEY_F(10), 0x00, 0x00, KEY_HOME,
+        KEY_UP, KEY_NPAGE, 0x00, KEY_LEFT, 0x00, KEY_RIGHT, 0x00, KEY_END,
+        KEY_DOWN, KEY_PPAGE, 0x00, KEY_DC, 0x00, 0x00, 0x7C
+        },
+       { /* Shift-ALT */
+        /* copied from US */
+        0x00, 0x1B, 0x21, 0x40, 0x23, 0x24, 0x25, 0x5E,
+        0x26, 0x2A, 0x28, 0x29, 0x5F, 0x2B, 0x08, 0x00,
+        0x51, 0x57, 0x45, 0x52, 0x54, 0x59, 0x55, 0x49,
+        0x4F, 0x50, 0x7B, 0x7D, 0x0A, 0x00, 0x41, 0x53,
+        0x44, 0x46, 0x47, 0x48, 0x4A, 0x4B, 0x4C, 0x3A,
+        0x22, 0x7E, 0x00, 0x7C, 0x5A, 0x58, 0x43, 0x56,
+        0x42, 0x4E, 0x4D, 0x3C, 0x3E, 0x3F, 0x00, 0x2A,
+        0x00, 0x20, 0x00, KEY_F(1), KEY_F(2), KEY_F(3), KEY_F(4), KEY_F(5),
+        KEY_F(6), KEY_F(7), KEY_F(8), KEY_F(9), KEY_F(10), 0x00, 0x00, KEY_HOME,
+        KEY_UP, KEY_NPAGE, 0x00, KEY_LEFT, 0x00, KEY_RIGHT, 0x00, KEY_END,
+        KEY_DOWN, KEY_PPAGE, 0x00, KEY_DC, 0x00, 0x00, 0x00
+        }
+}},
+#endif
 };
 
 #define MOD_SHIFT    (1 << 0)
@@ -95,6 +166,16 @@ unsigned short map[4][0x57] = {
 #define MOD_CAPSLOCK (1 << 2)
 #define MOD_ALT      (1 << 3)
 
+static void keyboard_cmd(unsigned char cmd, unsigned char val)
+{
+       outb(cmd, 0x60);
+       /* wait until keyboard controller accepts cmds: */
+       while (inb(0x64) & 2);
+       outb(val, 0x60);
+       while (inb(0x64) & 2);
+}
+
+
 int keyboard_havechar(void)
 {
        unsigned char c = inb(0x64);
@@ -144,10 +225,13 @@ int keyboard_getchar(void)
                modifier &= ~MOD_CTRL;
                break;
        case 0x3a:
-               if (modifier & MOD_CAPSLOCK)
+               if (modifier & MOD_CAPSLOCK) {
                        modifier &= ~MOD_CAPSLOCK;
-               else
+                       keyboard_cmd(0xed, (0 << 2));
+               } else {
                        modifier |= MOD_CAPSLOCK;
+                       keyboard_cmd(0xed, (1 << 2));
+               }
                break;
        }
 
@@ -158,12 +242,21 @@ int keyboard_getchar(void)
                if (modifier & MOD_ALT)
                        shift += 2;
 
-               ret = map[shift][ch];
-
-               if (modifier & MOD_CTRL)
-                       ret = (ret >= 'a' && ret <= 'z') ? ret & 0x1f : 0;
-
-               return ret;
+               ret = map->map[shift][ch];
+
+               if (modifier & MOD_CTRL) {
+                       switch (ret) {
+                       case 'a' ... 'z':
+                               ret &= 0x1f;
+                               break;
+                       case KEY_DC:
+                               /* vulcan nerve pinch */
+                               if ((modifier & MOD_ALT) && reset_handler)
+                                       reset_handler();
+                       default:
+                               ret = 0;
+                       }
+               }
        }
 
        return ret;
@@ -203,9 +296,41 @@ static void keyboard_set_mode(unsigned char mode)
        outb(mode, 0x60);
 }
 
+/**
+ * Set keyboard layout
+ * @param country string describing the keyboard layout language. 
+ * Valid values are "en", "de".
+ */
+
+int keyboard_set_layout(char *country)
+{
+       int i;
+
+       for (i=0; i<ARRAY_SIZE(keyboard_layouts); i++) {
+               if (strncmp(keyboard_layouts[i].country, country,
+                                       strlen(keyboard_layouts[i].country)))
+                       continue;
+
+               /* Found, changing keyboard layout */
+               map = &keyboard_layouts[i];
+               return 0;
+       }
+
+       /* Nothing found, not changed */
+       return -1;
+}
+
+int keyboard_add_reset_handler(void (*new_handler)(void))
+{
+       reset_handler = new_handler;
+
+       return 0;
+}
+
 void keyboard_init(void)
 {
        u8 mode;
+       map = &keyboard_layouts[0];
 
        /* Empty keyboard buffer */
        while (keyboard_havechar()) keyboard_getchar();

diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 6a4db0e05125916fc34d4e47e7ffcdaa1028b38a..b9ced5806451a8e47bd864a53c50f4009263dcfe 100644 (file)
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -123,6 +123,8 @@ void keyboard_init(void);
 int keyboard_havechar(void);
 unsigned char keyboard_get_scancode(void);
 int keyboard_getchar(void);
+int keyboard_set_layout(char *country);
+int keyboard_add_reset_handler(void (*new_handler)(void));
 /** @} */
 
 /**