Reflect recent changes in syscons and vga.

4 files changed, 268 insertions, 226 deletions

diff --git a/share/man/man4/man4.i386/syscons.4 b/share/man/man4/man4.i386/syscons.4
index 8812321..04a728e 100644
--- a/share/man/man4/man4.i386/syscons.4
+++ b/share/man/man4/man4.i386/syscons.4
@@ -24,9 +24,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: syscons.4,v 1.1 1999/02/10 14:25:03 yokota Exp $
+.\" $Id: syscons.4,v 1.2 1999/05/20 09:56:14 yokota Exp $
 .\"
-.Dd February 9, 1999
+.Dd June 30, 1999
 .Dt SYSCONS 4
 .Os FreeBSD
 .Sh NAME
@@ -35,18 +35,20 @@
 .Nd
 the console driver
 .Sh SYNOPSIS
-.Cd "options" \&"MAXCONS=N\&"
-.\".Cd "options" \&"SC_ALT_MOUSE_IMAGE\&"
-.Cd "options" \&"SC_DISABLE_REBOOT\&"
-.Cd "options" \&"SC_HISTORY_SIZE=N\&"
-.Cd "options" \&"SC_MOUSE_CHAR=C\&"
-.\".Cd "options" \&"SC_NO_CUTPASTE\&"
-.\".Cd "options" \&"SC_NO_FONT_LOADING\&"
-.\".Cd "options" \&"SC_NO_HISTORY\&"
-.\".Cd "options" \&"SC_NO_SYSMOUSE\&"
-.\".Cd "options" \&"SC_PIXEL_MODE\&"
-.Cd "options" \&"STD8X16FONT\&"
-.Cd "makeoptions" \&"STD8X16FONT\&"=\&"_font_name_\&"
+.Cd "options MAXCONS=N"
+.Cd "options SC_ALT_MOUSE_IMAGE"
+.Cd "options SC_DISABLE_DDBKEY"
+.Cd "options SC_DISABLE_REBOOT"
+.Cd "options SC_HISTORY_SIZE=N"
+.Cd "options SC_MOUSE_CHAR=C"
+.Cd "options SC_NO_CUTPASTE"
+.Cd "options SC_NO_FONT_LOADING"
+.Cd "options SC_NO_HISTORY"
+.Cd "options SC_NO_PALETTE_LOADING"
+.Cd "options SC_NO_SYSMOUSE"
+.Cd "options SC_PIXEL_MODE"
+.Cd "options SC_DFLT_FONT"
+.Cd "makeoptions SC_DFLT_FONT"=\&"_font_name_\&"
 .Cd "device sc0 at isa?"
 .Sh DESCRIPTION
 The
@@ -131,7 +133,7 @@ for the keymap file.
 You may want to set the
 .Ar keymap
 variable in 
-.Pa /etc/rc.conf
+.Pa /etc/rc.conf.local
 to the desired keymap file so that it will be automatically loaded
 when the system starts up.
 .Ss Software Font
@@ -156,13 +158,13 @@ You may set
 and
 .Ar font8x16
 variables in
-.Pa /etc/rc.conf
+.Pa /etc/rc.conf.local
 to the desired font files so that they will be automatically loaded
 when the system starts up.
 .Pp
-Optionally you can make a particular font file as the default 8x16 font.
+Optionally you can make a particular font file as the default font.
 See the
-.Em STD8X16FONT
+.Em SC_DFLT_FONT
 option below.
 .Ss Screen Map
 If your video card does not support software font, you may still be able
@@ -233,26 +235,36 @@ driver.
 This option sets the number of virtual terminals to
 .Fa N .
 The default value is 16.
-.\".It Em SC_ALT_MOUSE_IMAGE
-.\"This option selects the alternative way of displaying the mouse cursor
-.\"in the virtual terminal.
-.\"It may be vastly costly for some video cards to draw the arrow-shaped
-.\"cursor and you may want to try this option.
-.\"However, the appearance of the alternative mouse cursor may not be
-.\"very appealing.
+.It Em SC_ALT_MOUSE_IMAGE
+This option selects the alternative way of displaying the mouse cursor
+in the virtual terminal.
+It may be vastly costly for some video cards to draw the arrow-shaped
+cursor and you may want to try this option.
+However, the appearance of the alternative mouse cursor may not be
+very appealing.
+.It Em SC_DISABLE_DDBKEY
+This option disables the ``debug'' key (by default, it is 
+.Em Alt-Esc ,
+or
+.Em Ctl-PrintScreen
+).
+It will prevent the user from
+entering the kernel debugger DDB by pressing the key combination.  
+DDB will still be invoked when the kernel panics or hits a break point 
+if it is included in the kernel.
 .It Em SC_DISABLE_REBOOT
 This option disables the ``reboot'' key (by default, it is 
-.Em Ctl-Alt-Del ),
-so that the casual user may not accidentally reboot the system.
+.Em Ctl-Alt-Del
+), so that the casual user may not accidentally reboot the system.
 .It Em SC_HISTORY_SIZE=N
 Sets the size of back scroll buffer to 
 .Fa N
 lines.
 The default value is 100.
 .It Em SC_MOUSE_CHAR=C
-.\"Unless the
-.\".Em SC_ALT_MOUSE_IMAGE
-.\"option above is specified, the
+Unless the
+.Em SC_ALT_MOUSE_IMAGE
+option above is specified, the
 The
 .Nm
 driver reserves four consecutive character codes in order to display the 
@@ -262,9 +274,18 @@ This option specifies the first character code to
 to be used for this purpose.
 The default value is 0xd0.
 A good candidate is 0x03.
-.\".It Em SC_PIXEL_MODE
-.It Em STD8X16FONT
-This option will specify the default 8x16 font.
+.It Em SC_PIXEL_MODE
+Adds support for pixel (raster) mode console.
+This mode is useful on some laptop computers, but less so on
+most other systems, and it adds substantial amount of code to syscons.
+If the this option is NOT defined, you can reduce the kernel size a lot.
+See the
+.Em VESA800X600
+flag below.
+.It Em SC_DFLT_FONT
+This option will specify the default font.
+Available fonts are: iso, iso2, koi8-r, cp437, cp850, cp865 and cp866.
+16-line, 14-line and 8-line font data will be compiled in.  
 Without this option, the
 .Nm
 driver will use whatever font already loaded in the video card,
@@ -273,32 +294,33 @@ See
 .Sx EXAMPLE
 below.
 .El
-.\".Pp
-.\"The following options will remove some features from the
-.\".Nm
-.\"driver and save kernel memory.
-.\".Bl -tag -width MOUSE
-.\".It Em SC_NO_CUTPASTE
-.\"This option disables ``copy and paste'' operation in virtual
-.\"terminals.
-.\".It Em SC_NO_FONT_LOADING
-.\"The
-.\".Nm
-.\"driver can load software font on some video cards.
-.\"This option removes this feature.
-.\".It Em SC_NO_HISTORY
-.\"This option disables back-scrolling in virtual terminals.
-.\".It Em SC_NO_SYSMOUSE
-.\"This option removes mouse support in the
-.\".Nm
-.\"driver.
-.\"The mouse daemon
-.\".Xr moused 8
-.\"will fail if this option is defined.
-.\"This option implies the
-.\".Em SC_NO_CUTPASTE
-.\"option too.
-.\".El
+.Pp
+The following options will remove some features from the
+.Nm
+driver and save kernel memory.
+.Bl -tag -width MOUSE
+.It Em SC_NO_CUTPASTE
+This option disables ``copy and paste'' operation in virtual
+terminals.
+.It Em SC_NO_FONT_LOADING
+The
+.Nm
+driver can load software font on some video cards.
+This option removes this feature.
+.It Em SC_NO_HISTORY
+This option disables back-scrolling in virtual terminals.
+.\".It Em SC_NO_PALETTE_LOADING
+.It Em SC_NO_SYSMOUSE
+This option removes mouse support in the
+.Nm
+driver.
+The mouse daemon
+.Xr moused 8
+will fail if this option is defined.
+This option implies the
+.Em SC_NO_CUTPASTE
+option too.
+.El
 .Ss Driver Flags
 The following driver flags can be used to control the
 .Nm
@@ -309,32 +331,36 @@ or else in the User Configuration Menu at boot
 time
 .Pq see Xr boot 8 .
 .Bl -tag -width bit_0
-.It bit 0 (VISUAL_BELL)
-Uses the ``visual'' bell.
-The screen will blink instead of generating audible sound.
-.It bit 1,2 (CURSOR_TYPE)
-This option specifies the cursor appearance.
-Possible values are:
-.Bl -tag -width TYPE -compact
-.It Em 0
-normal block cursor
-.It Em 2
-blinking block cursor
-.It Em 4
-underline cursor
-.It Em 6
-blinking underline (aka destructive) cursor
-.El
-.It bit 6 (QUIET_BELL)
-This option suppresses the bell, whether audible or visual, 
-if it is rung in a background virtual terminal.
+.\".It bit 0 (VISUAL_BELL)
+.\"Uses the ``visual'' bell.
+.\"The screen will blink instead of generating audible sound.
+.\".It bit 1,2 (CURSOR_TYPE)
+.\"This option specifies the cursor appearance.
+.\"Possible values are:
+.\".Bl -tag -width TYPE -compact
+.\".It Em 0
+.\"normal block cursor
+.\".It Em 2
+.\"blinking block cursor
+.\".It Em 4
+.\"underline cursor
+.\".It Em 6
+.\"blinking underline (aka destructive) cursor
+.\".El
+.\".It bit 6 (QUIET_BELL)
+.\"This option suppresses the bell, whether audible or visual, 
+.\"if it is rung in a background virtual terminal.
 .It bit 7 (VESA800X600)
 This option puts the video card in the VESA 800x600 dots, 16 color
 mode.
 It may be useful for laptop computers for which the 800x600 mode
 is otherwise unsupported by the X server.
-Note that the ``copy-and-paste'' function is not currently supported in 
-this mode and the mouse pointer will not be displayed.
+Note that in order for this flag to work, the kernel must be 
+compiled with the
+.Em SC_PIXEL_MODE
+option explained above.
+.\"Note also that the ``copy-and-paste'' function is not currently supported 
+.\"in this mode and the mouse pointer will not be displayed.
 .El
 .Sh FILES
 .Bl -tag -width /usr/share/syscons/xxxxyyyyzzz -compact
@@ -374,12 +400,15 @@ Note that the keyboard controller driver
 is required by the keyboard driver
 .Nm atkbd .
 .Pp
-The following example adds the font file
-.Pa /usr/share/syscons/fonts/cp850-8x16.fnt
-to the kernel as the default 8x16 font.
+The following example adds the font files
+.Pa cp850-8x16.fnt ,
+.Pa cp850-8x14.font 
+and
+.Pa cp850-8x8.font
+to the kernel.
 .Pp
-.Dl "options" \&"STD8X16FONT\&"
-.Dl "makeoptions" \&"STD8X16FONT\&"=\&"cp850\&"
+.Dl "options SC_DFLT_FONT"
+.Dl "makeoptions SC_DFLT_FONT"=\&"cp850\&"
 .Dl "device sc0 at isa?
 .Pp
 .\".Sh DIAGNOSTICS
@@ -396,6 +425,7 @@ This manual page is incomplete and urgently needs revision.
 .Xr keyboard 4 ,
 .Xr screen 4 ,
 .Xr splash 4 ,
+.Xr ukbd 4 ,
 .Xr vga 4 ,
 .Xr keymap 5 ,
 .Xr rc.conf 5 ,
diff --git a/share/man/man4/man4.i386/vga.4 b/share/man/man4/man4.i386/vga.4
index a14ff5d..36c6826 100644
--- a/share/man/man4/man4.i386/vga.4
+++ b/share/man/man4/man4.i386/vga.4
@@ -24,9 +24,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: vga.4,v 1.1 1999/02/07 05:40:14 yokota Exp $
+.\" $Id: vga.4,v 1.2 1999/02/10 14:25:03 yokota Exp $
 .\"
-.Dd February 9, 1999
+.Dd June 30, 1999
 .Dt VGA 4
 .Os FreeBSD
 .Sh NAME
@@ -34,13 +34,13 @@
 .Nd
 generic video card interface
 .Sh SYNOPSIS
-.Cd "options" \&"VESA\&"
-.Cd "options" \&"VESA_DEBUG=N\&"
-.Cd "options" \&"VGA_ALT_SEQACCESS\&"
-.Cd "options" \&"VGA_NO_FONT_LOADING\&"
-.Cd "options" \&"VGA_NO_MODE_CHANGE\&"
-.Cd "options" \&"VGA_SLOW_IOACCESS\&"
-.Cd "options" \&"VM86\&"
+.Cd "options VESA"
+.Cd "options VESA_DEBUG=N"
+.Cd "options VGA_ALT_SEQACCESS"
+.Cd "options VGA_NO_FONT_LOADING"
+.Cd "options VGA_NO_MODE_CHANGE"
+.Cd "options VGA_SLOW_IOACCESS"
+.Cd "options VGA_WIDTH90"
 .Cd "device vga0 at isa? port ? conflicts"
 .Sh DESCRIPTION
 The
@@ -64,19 +64,14 @@ addition, the driver can utilize VESA BIOS extensions if the video card
 supports them. VESA support can either be statically included in the kernel
 or can be loaded as a separate module.
 .Pp
-In order to statically link the support to the kernel, the
+In order to statically link the VESA support to the kernel, the
 .Em VESA
-option (see below) and the
-.Em VM86
-option must be defined in the kernel configuration file.
+option (see below) must be defined in the kernel configuration file.
 .Pp
 The
 .Nm vesa
 module can be dynamically loaded into the kernel using 
 .Xr kldload 8 .
-This requires the
-.Em VM86
-option to be defined in the kernel configuration file.
 .Sh DRIVER CONFIGURATION
 .Ss Kernel Configuration Options
 The following kernel configuration options 
@@ -94,6 +89,10 @@ However, it may cause flicker on some systems.
 Older VGA cards may require this option for proper operation.
 It makes the driver perform byte-wide I/O to VGA registers and
 slow down a little.
+.It Em VGA_WIDTH90
+This option enables 90 column modes: 90x25, 90x30, 90x43, 90x50, 90x60.  
+These modes are not always supported by the video card and the display.
+It is highly likely that LCD display cannot work with these modes.
 .El
 .Pp
 The following options add optional features to the driver.
@@ -103,9 +102,6 @@ Add VESA BIOS support to the driver.
 If the VGA card has the VESA BIOS extension 1.2 or later, 
 this option will utilize the VESA BIOS service to switch to high
 resolution modes.
-This option requires the 
-.Em VM86
-option.
 .It Em VESA_DEBUG=N
 Set the VESA support debug level to
 .Fa N .
@@ -133,18 +129,13 @@ Your kernel configuration should normally have:
 The following lines should be included in the kernel configuration file
 in order to enable the VESA BIOS Extension support.
 .Pp
-.Dl "options" \&"VM86\&"
-.Dl "options" \&"VESA\&"
+.Dl "options VESA"
 .Dl "device vga0 at isa? port ? conflicts"
 .Pp
 If you do not want VESA support included in the kernel, but
-want to use occasionally, add the following lines to the kernel configuration
-file:
-.Pp
-.Dl "options" \&"VM86\&"
-.Dl "device vga0 at isa? port ? conflicts"
-.Pp
-Then load the
+want to use occasionally, do not add the
+.Em VESA
+option.  And load the
 .Nm vesa
 module as desired:
 .Pp
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index 8812321..04a728e 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -24,9 +24,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: syscons.4,v 1.1 1999/02/10 14:25:03 yokota Exp $
+.\" $Id: syscons.4,v 1.2 1999/05/20 09:56:14 yokota Exp $
 .\"
-.Dd February 9, 1999
+.Dd June 30, 1999
 .Dt SYSCONS 4
 .Os FreeBSD
 .Sh NAME
@@ -35,18 +35,20 @@
 .Nd
 the console driver
 .Sh SYNOPSIS
-.Cd "options" \&"MAXCONS=N\&"
-.\".Cd "options" \&"SC_ALT_MOUSE_IMAGE\&"
-.Cd "options" \&"SC_DISABLE_REBOOT\&"
-.Cd "options" \&"SC_HISTORY_SIZE=N\&"
-.Cd "options" \&"SC_MOUSE_CHAR=C\&"
-.\".Cd "options" \&"SC_NO_CUTPASTE\&"
-.\".Cd "options" \&"SC_NO_FONT_LOADING\&"
-.\".Cd "options" \&"SC_NO_HISTORY\&"
-.\".Cd "options" \&"SC_NO_SYSMOUSE\&"
-.\".Cd "options" \&"SC_PIXEL_MODE\&"
-.Cd "options" \&"STD8X16FONT\&"
-.Cd "makeoptions" \&"STD8X16FONT\&"=\&"_font_name_\&"
+.Cd "options MAXCONS=N"
+.Cd "options SC_ALT_MOUSE_IMAGE"
+.Cd "options SC_DISABLE_DDBKEY"
+.Cd "options SC_DISABLE_REBOOT"
+.Cd "options SC_HISTORY_SIZE=N"
+.Cd "options SC_MOUSE_CHAR=C"
+.Cd "options SC_NO_CUTPASTE"
+.Cd "options SC_NO_FONT_LOADING"
+.Cd "options SC_NO_HISTORY"
+.Cd "options SC_NO_PALETTE_LOADING"
+.Cd "options SC_NO_SYSMOUSE"
+.Cd "options SC_PIXEL_MODE"
+.Cd "options SC_DFLT_FONT"
+.Cd "makeoptions SC_DFLT_FONT"=\&"_font_name_\&"
 .Cd "device sc0 at isa?"
 .Sh DESCRIPTION
 The
@@ -131,7 +133,7 @@ for the keymap file.
 You may want to set the
 .Ar keymap
 variable in 
-.Pa /etc/rc.conf
+.Pa /etc/rc.conf.local
 to the desired keymap file so that it will be automatically loaded
 when the system starts up.
 .Ss Software Font
@@ -156,13 +158,13 @@ You may set
 and
 .Ar font8x16
 variables in
-.Pa /etc/rc.conf
+.Pa /etc/rc.conf.local
 to the desired font files so that they will be automatically loaded
 when the system starts up.
 .Pp
-Optionally you can make a particular font file as the default 8x16 font.
+Optionally you can make a particular font file as the default font.
 See the
-.Em STD8X16FONT
+.Em SC_DFLT_FONT
 option below.
 .Ss Screen Map
 If your video card does not support software font, you may still be able
@@ -233,26 +235,36 @@ driver.
 This option sets the number of virtual terminals to
 .Fa N .
 The default value is 16.
-.\".It Em SC_ALT_MOUSE_IMAGE
-.\"This option selects the alternative way of displaying the mouse cursor
-.\"in the virtual terminal.
-.\"It may be vastly costly for some video cards to draw the arrow-shaped
-.\"cursor and you may want to try this option.
-.\"However, the appearance of the alternative mouse cursor may not be
-.\"very appealing.
+.It Em SC_ALT_MOUSE_IMAGE
+This option selects the alternative way of displaying the mouse cursor
+in the virtual terminal.
+It may be vastly costly for some video cards to draw the arrow-shaped
+cursor and you may want to try this option.
+However, the appearance of the alternative mouse cursor may not be
+very appealing.
+.It Em SC_DISABLE_DDBKEY
+This option disables the ``debug'' key (by default, it is 
+.Em Alt-Esc ,
+or
+.Em Ctl-PrintScreen
+).
+It will prevent the user from
+entering the kernel debugger DDB by pressing the key combination.  
+DDB will still be invoked when the kernel panics or hits a break point 
+if it is included in the kernel.
 .It Em SC_DISABLE_REBOOT
 This option disables the ``reboot'' key (by default, it is 
-.Em Ctl-Alt-Del ),
-so that the casual user may not accidentally reboot the system.
+.Em Ctl-Alt-Del
+), so that the casual user may not accidentally reboot the system.
 .It Em SC_HISTORY_SIZE=N
 Sets the size of back scroll buffer to 
 .Fa N
 lines.
 The default value is 100.
 .It Em SC_MOUSE_CHAR=C
-.\"Unless the
-.\".Em SC_ALT_MOUSE_IMAGE
-.\"option above is specified, the
+Unless the
+.Em SC_ALT_MOUSE_IMAGE
+option above is specified, the
 The
 .Nm
 driver reserves four consecutive character codes in order to display the 
@@ -262,9 +274,18 @@ This option specifies the first character code to
 to be used for this purpose.
 The default value is 0xd0.
 A good candidate is 0x03.
-.\".It Em SC_PIXEL_MODE
-.It Em STD8X16FONT
-This option will specify the default 8x16 font.
+.It Em SC_PIXEL_MODE
+Adds support for pixel (raster) mode console.
+This mode is useful on some laptop computers, but less so on
+most other systems, and it adds substantial amount of code to syscons.
+If the this option is NOT defined, you can reduce the kernel size a lot.
+See the
+.Em VESA800X600
+flag below.
+.It Em SC_DFLT_FONT
+This option will specify the default font.
+Available fonts are: iso, iso2, koi8-r, cp437, cp850, cp865 and cp866.
+16-line, 14-line and 8-line font data will be compiled in.  
 Without this option, the
 .Nm
 driver will use whatever font already loaded in the video card,
@@ -273,32 +294,33 @@ See
 .Sx EXAMPLE
 below.
 .El
-.\".Pp
-.\"The following options will remove some features from the
-.\".Nm
-.\"driver and save kernel memory.
-.\".Bl -tag -width MOUSE
-.\".It Em SC_NO_CUTPASTE
-.\"This option disables ``copy and paste'' operation in virtual
-.\"terminals.
-.\".It Em SC_NO_FONT_LOADING
-.\"The
-.\".Nm
-.\"driver can load software font on some video cards.
-.\"This option removes this feature.
-.\".It Em SC_NO_HISTORY
-.\"This option disables back-scrolling in virtual terminals.
-.\".It Em SC_NO_SYSMOUSE
-.\"This option removes mouse support in the
-.\".Nm
-.\"driver.
-.\"The mouse daemon
-.\".Xr moused 8
-.\"will fail if this option is defined.
-.\"This option implies the
-.\".Em SC_NO_CUTPASTE
-.\"option too.
-.\".El
+.Pp
+The following options will remove some features from the
+.Nm
+driver and save kernel memory.
+.Bl -tag -width MOUSE
+.It Em SC_NO_CUTPASTE
+This option disables ``copy and paste'' operation in virtual
+terminals.
+.It Em SC_NO_FONT_LOADING
+The
+.Nm
+driver can load software font on some video cards.
+This option removes this feature.
+.It Em SC_NO_HISTORY
+This option disables back-scrolling in virtual terminals.
+.\".It Em SC_NO_PALETTE_LOADING
+.It Em SC_NO_SYSMOUSE
+This option removes mouse support in the
+.Nm
+driver.
+The mouse daemon
+.Xr moused 8
+will fail if this option is defined.
+This option implies the
+.Em SC_NO_CUTPASTE
+option too.
+.El
 .Ss Driver Flags
 The following driver flags can be used to control the
 .Nm
@@ -309,32 +331,36 @@ or else in the User Configuration Menu at boot
 time
 .Pq see Xr boot 8 .
 .Bl -tag -width bit_0
-.It bit 0 (VISUAL_BELL)
-Uses the ``visual'' bell.
-The screen will blink instead of generating audible sound.
-.It bit 1,2 (CURSOR_TYPE)
-This option specifies the cursor appearance.
-Possible values are:
-.Bl -tag -width TYPE -compact
-.It Em 0
-normal block cursor
-.It Em 2
-blinking block cursor
-.It Em 4
-underline cursor
-.It Em 6
-blinking underline (aka destructive) cursor
-.El
-.It bit 6 (QUIET_BELL)
-This option suppresses the bell, whether audible or visual, 
-if it is rung in a background virtual terminal.
+.\".It bit 0 (VISUAL_BELL)
+.\"Uses the ``visual'' bell.
+.\"The screen will blink instead of generating audible sound.
+.\".It bit 1,2 (CURSOR_TYPE)
+.\"This option specifies the cursor appearance.
+.\"Possible values are:
+.\".Bl -tag -width TYPE -compact
+.\".It Em 0
+.\"normal block cursor
+.\".It Em 2
+.\"blinking block cursor
+.\".It Em 4
+.\"underline cursor
+.\".It Em 6
+.\"blinking underline (aka destructive) cursor
+.\".El
+.\".It bit 6 (QUIET_BELL)
+.\"This option suppresses the bell, whether audible or visual, 
+.\"if it is rung in a background virtual terminal.
 .It bit 7 (VESA800X600)
 This option puts the video card in the VESA 800x600 dots, 16 color
 mode.
 It may be useful for laptop computers for which the 800x600 mode
 is otherwise unsupported by the X server.
-Note that the ``copy-and-paste'' function is not currently supported in 
-this mode and the mouse pointer will not be displayed.
+Note that in order for this flag to work, the kernel must be 
+compiled with the
+.Em SC_PIXEL_MODE
+option explained above.
+.\"Note also that the ``copy-and-paste'' function is not currently supported 
+.\"in this mode and the mouse pointer will not be displayed.
 .El
 .Sh FILES
 .Bl -tag -width /usr/share/syscons/xxxxyyyyzzz -compact
@@ -374,12 +400,15 @@ Note that the keyboard controller driver
 is required by the keyboard driver
 .Nm atkbd .
 .Pp
-The following example adds the font file
-.Pa /usr/share/syscons/fonts/cp850-8x16.fnt
-to the kernel as the default 8x16 font.
+The following example adds the font files
+.Pa cp850-8x16.fnt ,
+.Pa cp850-8x14.font 
+and
+.Pa cp850-8x8.font
+to the kernel.
 .Pp
-.Dl "options" \&"STD8X16FONT\&"
-.Dl "makeoptions" \&"STD8X16FONT\&"=\&"cp850\&"
+.Dl "options SC_DFLT_FONT"
+.Dl "makeoptions SC_DFLT_FONT"=\&"cp850\&"
 .Dl "device sc0 at isa?
 .Pp
 .\".Sh DIAGNOSTICS
@@ -396,6 +425,7 @@ This manual page is incomplete and urgently needs revision.
 .Xr keyboard 4 ,
 .Xr screen 4 ,
 .Xr splash 4 ,
+.Xr ukbd 4 ,
 .Xr vga 4 ,
 .Xr keymap 5 ,
 .Xr rc.conf 5 ,
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index a14ff5d..36c6826 100644
--- a/share/man/man4/vga.4
+++ b/share/man/man4/vga.4
@@ -24,9 +24,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: vga.4,v 1.1 1999/02/07 05:40:14 yokota Exp $
+.\" $Id: vga.4,v 1.2 1999/02/10 14:25:03 yokota Exp $
 .\"
-.Dd February 9, 1999
+.Dd June 30, 1999
 .Dt VGA 4
 .Os FreeBSD
 .Sh NAME
@@ -34,13 +34,13 @@
 .Nd
 generic video card interface
 .Sh SYNOPSIS
-.Cd "options" \&"VESA\&"
-.Cd "options" \&"VESA_DEBUG=N\&"
-.Cd "options" \&"VGA_ALT_SEQACCESS\&"
-.Cd "options" \&"VGA_NO_FONT_LOADING\&"
-.Cd "options" \&"VGA_NO_MODE_CHANGE\&"
-.Cd "options" \&"VGA_SLOW_IOACCESS\&"
-.Cd "options" \&"VM86\&"
+.Cd "options VESA"
+.Cd "options VESA_DEBUG=N"
+.Cd "options VGA_ALT_SEQACCESS"
+.Cd "options VGA_NO_FONT_LOADING"
+.Cd "options VGA_NO_MODE_CHANGE"
+.Cd "options VGA_SLOW_IOACCESS"
+.Cd "options VGA_WIDTH90"
 .Cd "device vga0 at isa? port ? conflicts"
 .Sh DESCRIPTION
 The
@@ -64,19 +64,14 @@ addition, the driver can utilize VESA BIOS extensions if the video card
 supports them. VESA support can either be statically included in the kernel
 or can be loaded as a separate module.
 .Pp
-In order to statically link the support to the kernel, the
+In order to statically link the VESA support to the kernel, the
 .Em VESA
-option (see below) and the
-.Em VM86
-option must be defined in the kernel configuration file.
+option (see below) must be defined in the kernel configuration file.
 .Pp
 The
 .Nm vesa
 module can be dynamically loaded into the kernel using 
 .Xr kldload 8 .
-This requires the
-.Em VM86
-option to be defined in the kernel configuration file.
 .Sh DRIVER CONFIGURATION
 .Ss Kernel Configuration Options
 The following kernel configuration options 
@@ -94,6 +89,10 @@ However, it may cause flicker on some systems.
 Older VGA cards may require this option for proper operation.
 It makes the driver perform byte-wide I/O to VGA registers and
 slow down a little.
+.It Em VGA_WIDTH90
+This option enables 90 column modes: 90x25, 90x30, 90x43, 90x50, 90x60.  
+These modes are not always supported by the video card and the display.
+It is highly likely that LCD display cannot work with these modes.
 .El
 .Pp
 The following options add optional features to the driver.
@@ -103,9 +102,6 @@ Add VESA BIOS support to the driver.
 If the VGA card has the VESA BIOS extension 1.2 or later, 
 this option will utilize the VESA BIOS service to switch to high
 resolution modes.
-This option requires the 
-.Em VM86
-option.
 .It Em VESA_DEBUG=N
 Set the VESA support debug level to
 .Fa N .
@@ -133,18 +129,13 @@ Your kernel configuration should normally have:
 The following lines should be included in the kernel configuration file
 in order to enable the VESA BIOS Extension support.
 .Pp
-.Dl "options" \&"VM86\&"
-.Dl "options" \&"VESA\&"
+.Dl "options VESA"
 .Dl "device vga0 at isa? port ? conflicts"
 .Pp
 If you do not want VESA support included in the kernel, but
-want to use occasionally, add the following lines to the kernel configuration
-file:
-.Pp
-.Dl "options" \&"VM86\&"
-.Dl "device vga0 at isa? port ? conflicts"
-.Pp
-Then load the
+want to use occasionally, do not add the
+.Em VESA
+option.  And load the
 .Nm vesa
 module as desired:
 .Pp