d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r297685: Add option to specify built-in keymap for kbdmux

Browse Source 
PR:		153459
Submitted by:	swell.k@gmail.com
This commit is contained in:
emaste 2016-04-21 19:25:33 +00:00
parent b322fc6681
commit d8b3896c2b
5 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/conf/NOTES
View File

@ -1413,6 +1413,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

4
sys/conf/files
View File

@ -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" \

2
sys/conf/options
View File

@ -796,6 +796,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

8
sys/dev/kbdmux/kbdmux.c
View File

@ -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"

2
sys/modules/kbdmux/Makefile
View File

@ -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: