Add option to specify built-in keymap for kbdmux
PR: 153459 Submitted by: swell.k@gmail.com
This commit is contained in:
parent
bcfa4e676b
commit
46360281f0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=297685
@ -1409,6 +1409,10 @@ options MSGBUF_SIZE=40960
|
||||
options KBD_DISABLE_KEYMAP_LOAD # refuse to load a keymap
|
||||
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
|
||||
|
||||
device kbdmux # keyboard multiplexer
|
||||
options KBDMUX_DFLT_KEYMAP # specify the built-in keymap
|
||||
makeoptions KBDMUX_DFLT_KEYMAP=it.iso
|
||||
|
||||
options FB_DEBUG # Frame buffer debugging
|
||||
|
||||
device splash # Splash screen and screen saver support
|
||||
|
@ -47,6 +47,10 @@ pccarddevs.h standard \
|
||||
compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \
|
||||
no-obj no-implicit-rule before-depend \
|
||||
clean "pccarddevs.h"
|
||||
kbdmuxmap.h optional kbdmux_dflt_keymap \
|
||||
compile-with "kbdcontrol -P ${S:S/sys$/share/}/vt/keymaps -P ${S:S/sys$/share/}/syscons/keymaps -L ${KBDMUX_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > kbdmuxmap.h" \
|
||||
no-obj no-implicit-rule before-depend \
|
||||
clean "kbdmuxmap.h"
|
||||
teken_state.h optional sc | vt \
|
||||
dependency "$S/teken/gensequences $S/teken/sequences" \
|
||||
compile-with "${AWK} -f $S/teken/gensequences $S/teken/sequences > teken_state.h" \
|
||||
|
@ -801,6 +801,8 @@ KBD_MAXWAIT opt_kbd.h
|
||||
KBD_RESETDELAY opt_kbd.h
|
||||
KBDIO_DEBUG opt_kbd.h
|
||||
|
||||
KBDMUX_DFLT_KEYMAP opt_kbdmux.h
|
||||
|
||||
# options for the Atheros driver
|
||||
ATH_DEBUG opt_ath.h
|
||||
ATH_TXBUF opt_ath.h
|
||||
|
@ -33,6 +33,7 @@
|
||||
|
||||
#include "opt_compat.h"
|
||||
#include "opt_kbd.h"
|
||||
#include "opt_kbdmux.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/bus.h>
|
||||
@ -54,6 +55,13 @@
|
||||
#include <sys/taskqueue.h>
|
||||
#include <sys/uio.h>
|
||||
#include <dev/kbd/kbdreg.h>
|
||||
|
||||
/* the initial key map, accent map and fkey strings */
|
||||
#ifdef KBDMUX_DFLT_KEYMAP
|
||||
#define KBD_DFLT_KEYMAP
|
||||
#include "kbdmuxmap.h"
|
||||
#endif
|
||||
|
||||
#include <dev/kbd/kbdtables.h>
|
||||
|
||||
#define KEYBOARD_NAME "kbdmux"
|
||||
|
@ -4,7 +4,7 @@
|
||||
.PATH: ${.CURDIR}/../../dev/kbdmux
|
||||
|
||||
KMOD= kbdmux
|
||||
SRCS= kbdmux.c opt_compat.h opt_kbd.h bus_if.h device_if.h
|
||||
SRCS= kbdmux.c opt_compat.h opt_kbd.h opt_kbdmux.h bus_if.h device_if.h
|
||||
|
||||
.if !defined(KERNBUILDDIR)
|
||||
opt_compat.h:
|
||||
|
Loading…
Reference in New Issue
Block a user