aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2016-09-02 16:17:14 -0400
committerKevin O'Connor <kevin@koconnor.net>2016-09-12 10:22:10 -0400
commitb47c6e3f70442829efb879dd1442ae9bdba62806 (patch)
tree189764ac9c8a1b119d9e43bfe0d8ad6df5120182
parent2490327b7973b4bd9c94f31bbfca7096c5182063 (diff)
downloadseabios-b47c6e3f70442829efb879dd1442ae9bdba62806.tar.gz
seabios-b47c6e3f70442829efb879dd1442ae9bdba62806.tar.xz
seabios-b47c6e3f70442829efb879dd1442ae9bdba62806.zip
kbd: Implement extended keycode mappings for keypad-enter and keypad-/
On a 101-key keyboard the keypad enter and keypad '/' keys have unique BIOS keycodes that are distinct from the main keyboard enter and '/' keys. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r--src/kbd.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/kbd.c b/src/kbd.c
index 45edd8f..cc41025 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -98,6 +98,12 @@ dequeue_key(struct bregs *regs, int incr, int extended)
// Translate extended keys
if (ascii == 0xe0 && keycode & 0xff00)
keycode &= 0xff00;
+ else if (keycode == 0xe00d || keycode == 0xe00a)
+ // Extended enter key
+ keycode = 0x1c00 | ascii;
+ else if (keycode == 0xe02f)
+ // Extended '/' key
+ keycode = 0x352f;
// Technically, if the ascii value is 0xf0 or if the
// 'scancode' is greater than 0x84 then the key should be
// discarded. However, there seems no harm in passing on the
@@ -385,6 +391,13 @@ static struct scaninfo {
{ 0x8600, 0x8800, 0x8a00, 0x8c00 }, /* F12 */
};
+struct scaninfo key_ext_enter VAR16 = {
+ 0xe00d, 0xe00d, 0xe00a, 0xa600
+};
+struct scaninfo key_ext_slash VAR16 = {
+ 0xe02f, 0xe02f, 0x9500, 0xa400
+};
+
// Handle a ps2 style scancode read from the keyboard.
static void
__process_key(u8 scancode)
@@ -515,6 +528,8 @@ __process_key(u8 scancode)
}
u16 keycode;
struct scaninfo *info = &scan_to_keycode[scancode];
+ if (flags2 & KF2_LAST_E0 && (scancode == 0x1c || scancode == 0x35))
+ info = (scancode == 0x1c ? &key_ext_enter : &key_ext_slash);
if (flags0 & KF0_ALTACTIVE) {
keycode = GET_GLOBAL(info->alt);
} else if (flags0 & KF0_CTRLACTIVE) {