From 0a0319c27f732ce099abc5928de1b8dbdea7dc8b Mon Sep 17 00:00:00 2001 From: Kazutaka YOKOTA Date: Wed, 10 Mar 1999 14:47:41 +0000 Subject: [PATCH] - Added new options (ATKBD_DFLT_KEYMAP, KBD_DISABLE_KEYMAP_LOAD and KBD_INSTALL_CDEV). - Removed the note that the VESA option cannot be used on the SMP system; this is not true. - Moved the option VESA to more appropriate place. --- sys/conf/NOTES | 17 ++++++++++++----- sys/i386/conf/LINT | 17 ++++++++++++----- sys/i386/conf/NOTES | 17 ++++++++++++----- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 2c87356e6d07..e3d68640a6cd 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.563 1999/03/09 00:24:27 brian Exp $ +# $Id: LINT,v 1.564 1999/03/09 20:20:01 phk Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -876,6 +876,14 @@ controller atkbdc0 at isa? port IO_KBD tty # The AT keyboard device atkbd0 at isa? tty irq 1 +# Options for atkbd: +options ATKBD_DFLT_KEYMAP # specify the built-in keymap +makeoptions ATKBD_DFLT_KEYMAP="jp.106" + +# These options are valid for other keyboard drivers as well. +options KBD_DISABLE_KEYMAP_LOAD # refuse to load a keymap +options KBD_INSTALL_CDEV # install a CDEV entry in /dev + # `flags' for atkbd: # 0x01 Force detection of keyboard, else we always assume a keyboard # 0x02 Don't reset keyboard, useful for some newer ThinkPads @@ -906,6 +914,9 @@ options VGA_NO_MODE_CHANGE # don't change video modes # Older video cards may require this option for proper operation. options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs +# To include support for VESA video modes +options VESA # needs VM86 defined too!! + # Splash screen at start up! Screen savers require this too. pseudo-device splash @@ -935,10 +946,6 @@ makeoptions "STD8X16FONT"="cp850" options SC_HISTORY_SIZE=200 # number of history buffer lines options SC_DISABLE_REBOOT # disable reboot key sequence -# To include support for VESA video modes -# Dont use together with SMP!! -options VESA # needs VM86 defined too!! - # # `flags' for sc0: # 0x01 Use a 'visual' bell diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 2c87356e6d07..e3d68640a6cd 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.563 1999/03/09 00:24:27 brian Exp $ +# $Id: LINT,v 1.564 1999/03/09 20:20:01 phk Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -876,6 +876,14 @@ controller atkbdc0 at isa? port IO_KBD tty # The AT keyboard device atkbd0 at isa? tty irq 1 +# Options for atkbd: +options ATKBD_DFLT_KEYMAP # specify the built-in keymap +makeoptions ATKBD_DFLT_KEYMAP="jp.106" + +# These options are valid for other keyboard drivers as well. +options KBD_DISABLE_KEYMAP_LOAD # refuse to load a keymap +options KBD_INSTALL_CDEV # install a CDEV entry in /dev + # `flags' for atkbd: # 0x01 Force detection of keyboard, else we always assume a keyboard # 0x02 Don't reset keyboard, useful for some newer ThinkPads @@ -906,6 +914,9 @@ options VGA_NO_MODE_CHANGE # don't change video modes # Older video cards may require this option for proper operation. options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs +# To include support for VESA video modes +options VESA # needs VM86 defined too!! + # Splash screen at start up! Screen savers require this too. pseudo-device splash @@ -935,10 +946,6 @@ makeoptions "STD8X16FONT"="cp850" options SC_HISTORY_SIZE=200 # number of history buffer lines options SC_DISABLE_REBOOT # disable reboot key sequence -# To include support for VESA video modes -# Dont use together with SMP!! -options VESA # needs VM86 defined too!! - # # `flags' for sc0: # 0x01 Use a 'visual' bell diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 2c87356e6d07..e3d68640a6cd 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.563 1999/03/09 00:24:27 brian Exp $ +# $Id: LINT,v 1.564 1999/03/09 20:20:01 phk Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -876,6 +876,14 @@ controller atkbdc0 at isa? port IO_KBD tty # The AT keyboard device atkbd0 at isa? tty irq 1 +# Options for atkbd: +options ATKBD_DFLT_KEYMAP # specify the built-in keymap +makeoptions ATKBD_DFLT_KEYMAP="jp.106" + +# These options are valid for other keyboard drivers as well. +options KBD_DISABLE_KEYMAP_LOAD # refuse to load a keymap +options KBD_INSTALL_CDEV # install a CDEV entry in /dev + # `flags' for atkbd: # 0x01 Force detection of keyboard, else we always assume a keyboard # 0x02 Don't reset keyboard, useful for some newer ThinkPads @@ -906,6 +914,9 @@ options VGA_NO_MODE_CHANGE # don't change video modes # Older video cards may require this option for proper operation. options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs +# To include support for VESA video modes +options VESA # needs VM86 defined too!! + # Splash screen at start up! Screen savers require this too. pseudo-device splash @@ -935,10 +946,6 @@ makeoptions "STD8X16FONT"="cp850" options SC_HISTORY_SIZE=200 # number of history buffer lines options SC_DISABLE_REBOOT # disable reboot key sequence -# To include support for VESA video modes -# Dont use together with SMP!! -options VESA # needs VM86 defined too!! - # # `flags' for sc0: # 0x01 Use a 'visual' bell