@@ -, +, @@ --- sys/conf/files.amd64 | 5 +++++ sys/conf/options.amd64 | 2 ++ sys/dev/kbdmux/kbdmux.c | 9 +++++++++ 3 files changed, 16 insertions(+) --- b/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -47,6 +47,11 @@ ukbdmap.h optional ukbd_dflt_keymap \ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # +kbdmuxmap.h optional kbdmux_dflt_keymap \ + 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" \ + no-obj no-implicit-rule before-depend \ + clean "kbdmuxmap.h" +# hpt27xx_lib.o optional hpt27xx \ dependency "$S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \ compile-with "uudecode < $S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \ --- b/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -49,6 +49,8 @@ AGP_DEBUG opt_agp.h ATKBD_DFLT_KEYMAP opt_atkbd.h +KBDMUX_DFLT_KEYMAP opt_kbdmux.h + # ------------------------------- # EOF # ------------------------------- --- b/sys/dev/kbdmux/kbdmux.c +++ b/sys/dev/kbdmux/kbdmux.c @@ -33,6 +33,7 @@ #include "opt_compat.h" #include "opt_kbd.h" +#include "opt_kbdmux.h" #include #include @@ -54,6 +55,14 @@ #include #include #include + +/* 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 #define KEYBOARD_NAME "kbdmux" --