Date: Thu, 21 Apr 2016 19:25:33 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r298430 - in stable/10/sys: conf dev/kbdmux modules/kbdmux Message-ID: <201604211925.u3LJPXgS007543@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Thu Apr 21 19:25:33 2016 New Revision: 298430 URL: https://svnweb.freebsd.org/changeset/base/298430 Log: MFC r297685: Add option to specify built-in keymap for kbdmux PR: 153459 Submitted by: swell.k@gmail.com Modified: stable/10/sys/conf/NOTES stable/10/sys/conf/files stable/10/sys/conf/options stable/10/sys/dev/kbdmux/kbdmux.c stable/10/sys/modules/kbdmux/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/conf/NOTES ============================================================================== --- stable/10/sys/conf/NOTES Thu Apr 21 19:24:36 2016 (r298429) +++ stable/10/sys/conf/NOTES Thu Apr 21 19:25:33 2016 (r298430) @@ -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 Modified: stable/10/sys/conf/files ============================================================================== --- stable/10/sys/conf/files Thu Apr 21 19:24:36 2016 (r298429) +++ stable/10/sys/conf/files Thu Apr 21 19:25:33 2016 (r298430) @@ -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" \ Modified: stable/10/sys/conf/options ============================================================================== --- stable/10/sys/conf/options Thu Apr 21 19:24:36 2016 (r298429) +++ stable/10/sys/conf/options Thu Apr 21 19:25:33 2016 (r298430) @@ -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 Modified: stable/10/sys/dev/kbdmux/kbdmux.c ============================================================================== --- stable/10/sys/dev/kbdmux/kbdmux.c Thu Apr 21 19:24:36 2016 (r298429) +++ stable/10/sys/dev/kbdmux/kbdmux.c Thu Apr 21 19:25:33 2016 (r298430) @@ -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" Modified: stable/10/sys/modules/kbdmux/Makefile ============================================================================== --- stable/10/sys/modules/kbdmux/Makefile Thu Apr 21 19:24:36 2016 (r298429) +++ stable/10/sys/modules/kbdmux/Makefile Thu Apr 21 19:25:33 2016 (r298430) @@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604211925.u3LJPXgS007543>