[console] Generalise bios_keymap() as key_remap()

Allow the keyboard remapping functionality to be exposed to consoles
other than the BIOS console.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/x86/interface/pcbios/bios_console.c b/src/arch/x86/interface/pcbios/bios_console.c
index 80ebf330ef9057e440285e6581f6e2617ef0c80d..0692e7a6ca0cd18151680d5bf0b5df7177eb6193 100644 (file)
--- a/src/arch/x86/interface/pcbios/bios_console.c
+++ b/src/arch/x86/interface/pcbios/bios_console.c
@@ -339,22 +339,6 @@ static const char * bios_ansi_seq ( unsigned int scancode ) {
        return NULL;
 }
 
-/**
- * Map a key
- *
- * @v character                Character read from console
- * @ret character      Mapped character
- */
-static int bios_keymap ( unsigned int character ) {
-       struct key_mapping *mapping;
-
-       for_each_table_entry ( mapping, KEYMAP ) {
-               if ( mapping->from == character )
-                       return mapping->to;
-       }
-       return character;
-}
-
 /**
  * Get character from BIOS console
  *
@@ -387,7 +371,7 @@ static int bios_getchar ( void ) {
 
        /* If it's a normal character, just map and return it */
        if ( character && ( character < 0x80 ) )
-               return bios_keymap ( character );
+               return key_remap ( character );
 
        /* Otherwise, check for a special key that we know about */
        if ( ( ansi_seq = bios_ansi_seq ( keypress >> 8 ) ) ) {

diff --git a/src/core/keymap.c b/src/core/keymap.c
new file mode 100644 (file)
index 0000000..a6707a2
--- /dev/null
+++ b/src/core/keymap.c
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2022 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <ipxe/keymap.h>
+
+/** @file
+ *
+ * Keyboard mappings
+ *
+ */
+
+/**
+ * Remap a key
+ *
+ * @v character                Character read from console
+ * @ret character      Mapped character
+ */
+unsigned int key_remap ( unsigned int character ) {
+       struct key_mapping *mapping;
+
+       /* Remap via table */
+       for_each_table_entry ( mapping, KEYMAP ) {
+               if ( mapping->from == character ) {
+                       character = mapping->to;
+                       break;
+               }
+       }
+
+       return character;
+}

diff --git a/src/include/ipxe/keymap.h b/src/include/ipxe/keymap.h
index 0f1b0c656336dcc567f30b54c6f9e3eed052bf78..62b3bb13120b21718a7d59c1a91bbc18788b663b 100644 (file)
--- a/src/include/ipxe/keymap.h
+++ b/src/include/ipxe/keymap.h
@@ -27,4 +27,6 @@ struct key_mapping {
 /** Define a keyboard mapping */
 #define __keymap __table_entry ( KEYMAP, 01 )
 
+extern unsigned int key_remap ( unsigned int character );
+
 #endif /* _IPXE_KEYMAP_H */