Attachment #148901 for bug #194744

View | Details | Raw Unified | Return to bug 194744
Collapse All | Expand All

Lines 47-52 ukbdmap.h optional ukbd_dflt_keymap \ Link Here

(-)b/sys/conf/files.amd64 (+5 lines)
47	no-obj no-implicit-rule before-depend \	47	no-obj no-implicit-rule before-depend \
48	clean "ukbdmap.h"	48	clean "ukbdmap.h"
49	#	49	#
		50	kbdmuxmap.h optional kbdmux_dflt_keymap \
		51	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" \
		52	no-obj no-implicit-rule before-depend \
		53	clean "kbdmuxmap.h"
		54	#
50	hpt27xx_lib.o optional hpt27xx \	55	hpt27xx_lib.o optional hpt27xx \
51	dependency "$S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \	56	dependency "$S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \
52	compile-with "uudecode < $S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \	57	compile-with "uudecode < $S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \

Lines 49-54 AGP_DEBUG opt_agp.h Link Here

(-)b/sys/conf/options.amd64 (+2 lines)
49		49
50	ATKBD_DFLT_KEYMAP opt_atkbd.h	50	ATKBD_DFLT_KEYMAP opt_atkbd.h
51		51
		52	KBDMUX_DFLT_KEYMAP opt_kbdmux.h
		53
52	# -------------------------------	54	# -------------------------------
53	# EOF	55	# EOF
54	# -------------------------------	56	# -------------------------------





#include "opt_compat.h"
#include "opt_kbd.h"
#include "opt_kbdmux.h"

#include <sys/param.h>
#include <sys/bus.h>

#include <sys/taskqueue.h>
#include <sys/uio.h>
#include <dev/kbd/kbdreg.h>

/* the initial key map, accent map and fkey strings */
#if defined(KBDMUX_DFLT_KEYMAP) && !defined(KLD_MODULE)
#define	KBD_DFLT_KEYMAP
#include "kbdmuxmap.h"
#endif

/* the following file must be included after "ukbdmap.h" */
#include <dev/kbd/kbdtables.h>

#define KEYBOARD_NAME	"kbdmux"
- 

Return to bug 194744

Lines 33-38 Link Here

(-)b/sys/dev/kbdmux/kbdmux.c (-1 / +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	#if defined(KBDMUX_DFLT_KEYMAP) && !defined(KLD_MODULE)
		61	#define KBD_DFLT_KEYMAP
		62	#include "kbdmuxmap.h"
		63	#endif
		64
		65	/* the following file must be included after "ukbdmap.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"
60	-