Attachment #112106 for bug #153459

Lines 107-112 Link Here

(-)sys/conf/files (+4 lines)
107	compile-with "${AWK} -f $S/teken/gensequences $S/teken/sequences > teken_state.h" \	107	compile-with "${AWK} -f $S/teken/gensequences $S/teken/sequences > teken_state.h" \
108	no-obj no-implicit-rule before-depend \	108	no-obj no-implicit-rule before-depend \
109	clean "teken_state.h"	109	clean "teken_state.h"
		110	kbdmuxmap.h optional kbdmux_dflt_keymap \
		111	compile-with "/usr/sbin/kbdcontrol -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" \
		112	no-obj no-implicit-rule before-depend \
		113	clean "kbdmuxmap.h"
110	usbdevs.h optional usb \	114	usbdevs.h optional usb \
111	dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \	115	dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
112	compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \	116	compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \

Lines 754-759 Link Here

(-)sys/conf/options (+2 lines)
754	KBD_MAXWAIT opt_kbd.h	757	KBD_MAXWAIT opt_kbd.h
755	KBD_RESETDELAY opt_kbd.h	758	KBD_RESETDELAY opt_kbd.h
756	KBDIO_DEBUG opt_kbd.h	759	KBDIO_DEBUG opt_kbd.h
		760
		761	KBDMUX_DFLT_KEYMAP opt_kbdmux.h
757		762
758	# options for the Atheros driver	763	# options for the Atheros driver
759	ATH_DEBUG opt_ath.h	764	ATH_DEBUG opt_ath.h

Lines 33-38 Link Here

(-)sys/dev/kbdmux/kbdmux.c (+9 lines)
33		33
34	#include "opt_compat.h"	34	#include "opt_compat.h"
35	#include "opt_kbd.h"	35	#include "opt_kbd.h"
		36	#include "opt_kbdmux.h"
36		37
37	#include <sys/param.h>	38	#include <sys/param.h>
38	#include <sys/bus.h>	39	#include <sys/bus.h>
Lines 54-59 Link Here
54	#include <sys/taskqueue.h>	55	#include <sys/taskqueue.h>
55	#include <sys/uio.h>	56	#include <sys/uio.h>
56	#include <dev/kbd/kbdreg.h>	57	#include <dev/kbd/kbdreg.h>
		58
		59	/* the initial key map, accent map and fkey strings */
		60	#ifdef KBDMUX_DFLT_KEYMAP
		61	#define KBD_DFLT_KEYMAP
		62	#include "kbdmuxmap.h"
		63	#endif
		64
		65	/* the following file must be included after "kbdmuxmap.h" */
57	#include <dev/kbd/kbdtables.h>	66	#include <dev/kbd/kbdtables.h>
58		67
59	#define KEYBOARD_NAME "kbdmux"	68	#define KEYBOARD_NAME "kbdmux"

Lines 4-10 Link Here

(-)sys/modules/kbdmux/Makefile (-1 / +1 lines)
4	.PATH: ${.CURDIR}/../../dev/kbdmux	4	.PATH: ${.CURDIR}/../../dev/kbdmux
5		5
6	KMOD= kbdmux	6	KMOD= kbdmux
7	SRCS= kbdmux.c opt_compat.h opt_kbd.h bus_if.h device_if.h	7	SRCS= kbdmux.c opt_compat.h opt_kbd.h opt_kbdmux.h bus_if.h device_if.h
8		8
9	.if !defined(KERNBUILDDIR)	9	.if !defined(KERNBUILDDIR)
10	opt_compat.h:	10	opt_compat.h:

Lines 1373-1378 Link Here

(-)sys/conf/NOTES (+4 lines)
1373	options KBD_DISABLE_KEYMAP_LOAD # refuse to load a keymap	1373	options KBD_DISABLE_KEYMAP_LOAD # refuse to load a keymap
1374	options KBD_INSTALL_CDEV # install a CDEV entry in /dev	1374	options KBD_INSTALL_CDEV # install a CDEV entry in /dev
1375		1375
		1376	device kbdmux # keyboard multiplexer
		1377	options KBDMUX_DFLT_KEYMAP # specify the built-in keymap
		1378	makeoptions KBDMUX_DFLT_KEYMAP=it.iso
		1379
1376	options FB_DEBUG # Frame buffer debugging	1380	options FB_DEBUG # Frame buffer debugging
1377		1381
1378	device splash # Splash screen and screen saver support	1382	device splash # Splash screen and screen saver support

Return to bug 153459