narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
pull/576/head
Michael Brown 2022-02-09 15:54:39 +00:00
parent 64113751c3
commit f51a62bc3f
3 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/arch/x86/interface/pcbios/bios_console.c
View File

@ -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 ) ) ) {

52
src/core/keymap.c 100644
View File

@ -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;
}

2
src/include/ipxe/keymap.h
View File

@ -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 */