16 files changed, 254 insertions, 414 deletions

diff --git a/share/man/man4/man4.sparc/Makefile b/share/man/man4/man4.sparc/Makefile
index c5e20fb12f7..bf73f866e04 100644
--- a/share/man/man4/man4.sparc/Makefile
+++ b/share/man/man4/man4.sparc/Makefile
@@ -1,16 +1,17 @@
-#	$OpenBSD: Makefile,v 1.23 2002/07/09 18:41:27 jason Exp $
+#	$OpenBSD: Makefile,v 1.24 2002/08/12 10:48:21 miod Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 2/16/94
 
-MAN=	intro.4
-MAN+=	audioamd.4 audiocs.4 autoconf.4 be.4 bwtwo.4
-MAN+=	cgtwo.4 cgthree.4 cgfour.4 cgsix.4
-MAN+=	cgeight.4 cgfourteen.4 daadio.4 esp.4 fd.4 fga.4 hme.4 ie.4
-MAN+=	kbd.4 le.4 led.4
-MAN+=	magma.4 mem.4 ms.4 openprom.4 pnozz.4 qe.4 qec.4 scf.4 si.4 spif.4
-MAN+=	sw.4 tctrl.4 tcx.4 xbox.4 xd.4 xy.4 zs.4
-MLINKS=		mem.4 kmem.4
-MLINKS+=	fga.4 fvme.4
-MLINKS+=	fd.4 fdc.4
+MAN=	audioamd.4 audiocs.4 autoconf.4 be.4 bwtwo.4 cgtwo.4 cgthree.4 \
+	cgfour.4 cgsix.4 cgeight.4 cgtwelve.4 cgfourteen.4 daadio.4 \
+	esp.4 fd.4 fga.4 hme.4 ie.4 intro.4 le.4 led.4 magma.4 mem.4 \
+	openprom.4 pnozz.4 qe.4 qec.4 scf.4 si.4 spif.4 sw.4 tctrl.4 \
+	tcx.4 xbox.4 xd.4 xy.4 zs.4
+MLINKS=	fd.4 fdc.4 \
+	fga.4 fvme.4 \
+	le.4 lebuffer.4 \
+	mem.4 kmem.4 \
+	zs.4 zskbd.4 \
+	zs.4 zstty.4
 MANSUBDIR=sparc
 
 .include <bsd.prog.mk>
diff --git a/share/man/man4/man4.sparc/bwtwo.4 b/share/man/man4/man4.sparc/bwtwo.4
index 35002d7cea0..412792eac5c 100644
--- a/share/man/man4/man4.sparc/bwtwo.4
+++ b/share/man/man4/man4.sparc/bwtwo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bwtwo.4,v 1.11 2002/07/22 07:01:03 miod Exp $
+.\"	$OpenBSD: bwtwo.4,v 1.12 2002/08/12 10:48:21 miod Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -48,21 +48,27 @@
 .Cd "bwtwo0 at obio0 addr 0xfd000000 level 4" Pq sun4/200
 .Cd "bwtwo0 at obio0 addr 0xfb300000 level 4" Pq "sun4/300 in P4 slot"
 .Cd "bwtwo0 at obio0 addr 0x0b300000 level 4" Pq "sun4/100 in P4 slot"
+.Cd "wsdisplay* at bwtwo?"
 .Sh DESCRIPTION
 The
 .Nm
-is a memory based black and white frame buffer.
-It supports the minimal
-.Xr ioctl 2 Ns s
-needed to run
-.Xr X 7 .
+is a memory based black and white frame buffer for the
+.Xr wscons 4
+console framework.
+It does not provide direct device driver entry points
+but makes its functions available via the internal
+.Xr wsdisplay 4
+interface.
 .Sh SEE ALSO
 .Xr cgeight 4 ,
 .Xr cgfour 4 ,
 .Xr cgfourteen 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr cgtwo 4 ,
 .Xr pnozz 4 ,
 .Xr sbus 4 ,
-.Xr tcx 4
+.Xr tcx 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
diff --git a/share/man/man4/man4.sparc/cgeight.4 b/share/man/man4/man4.sparc/cgeight.4
index 827841cd7a0..baa4e0eaac8 100644
--- a/share/man/man4/man4.sparc/cgeight.4
+++ b/share/man/man4/man4.sparc/cgeight.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgeight.4,v 1.10 2002/07/22 07:01:03 miod Exp $
+.\"	$OpenBSD: cgeight.4,v 1.11 2002/08/12 10:48:21 miod Exp $
 .\"	$NetBSD: cgeight.4,v 1.2 1997/10/08 22:00:03 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -44,25 +44,26 @@
 .Sh SYNOPSIS
 .Cd "cgeight0 at obio0 addr 0xfb300000 level 4" Pq sun4/300
 .Cd "cgeight0 at obio0 addr 0x0b300000 level 4" Pq sun4/100
+.Cd "wsdisplay* at cgeight?"
 .Sh DESCRIPTION
 The
 .Nm
-is a memory based color frame buffer.
-Its pixel memory can be mapped into a user process address space
-by using the
-.Xr mmap 2
-system call.
-The
-.Nm
-driver supports the minimal
-.Xr ioctl 2 Ns s
-needed to run the X Window System.
+is a memory based color frame buffer for the
+.Xr wscons 4
+console framework.
+It does not provide direct device driver entry points
+but makes its functions available via the internal
+.Xr wsdisplay 4
+interface.
 .Sh SEE ALSO
 .Xr bwtwo 4 ,
 .Xr cgfour 4 ,
 .Xr cgfourteen 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr cgtwo 4 ,
 .Xr pnozz 4 ,
-.Xr tcx 4
+.Xr tcx 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
diff --git a/share/man/man4/man4.sparc/cgfour.4 b/share/man/man4/man4.sparc/cgfour.4
index 29f2117540b..639d1b06492 100644
--- a/share/man/man4/man4.sparc/cgfour.4
+++ b/share/man/man4/man4.sparc/cgfour.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgfour.4,v 1.9 2002/07/22 07:01:03 miod Exp $
+.\"	$OpenBSD: cgfour.4,v 1.10 2002/08/12 10:48:21 miod Exp $
 .\"	$NetBSD: cgfour.4,v 1.2 1997/10/08 22:00:05 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -44,27 +44,22 @@
 .Sh SYNOPSIS
 .Cd "cgfour0 at obio0 addr 0xfb300000 level 4" Pq sun4/300
 .Cd "cgfour0 at obio0 addr 0x0b300000 level 4" Pq sun4/100
+.Cd "wsdisplay* at cgfour?"
 .Sh DESCRIPTION
 The
 .Nm
-is a memory based color frame buffer with overlay plane.
-Its pixel memory and control planes can be mapped into a user
-process address space by using
-the
-.Xr mmap 2
-system call.
-The
-.Nm
-driver supports the minimal
-.Xr ioctl 2 Ns s
-needed to run
-.Xr X 1 .
+is a memory based color frame buffer with overlay plane for the
+.Xr wscons 4
+console framework.
 .Sh SEE ALSO
 .Xr bwtwo 4 ,
 .Xr cgeight 4 ,
 .Xr cgfourteen 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr cgtwo 4 ,
 .Xr pnozz 4 ,
-.Xr tcx 4
+.Xr tcx 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
diff --git a/share/man/man4/man4.sparc/cgfourteen.4 b/share/man/man4/man4.sparc/cgfourteen.4
index 211c3035cb8..f09d6c69106 100644
--- a/share/man/man4/man4.sparc/cgfourteen.4
+++ b/share/man/man4/man4.sparc/cgfourteen.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgfourteen.4,v 1.11 2002/07/22 07:01:03 miod Exp $
+.\"	$OpenBSD: cgfourteen.4,v 1.12 2002/08/12 10:48:21 miod Exp $
 .\"	$NetBSD: cgfourteen.4,v 1.3 1998/06/11 08:32:20 fair Exp $
 .\"
 .\" Copyright (c) 1996 The President and Fellows of Harvard College.
@@ -49,34 +49,27 @@
 .Nd accelerated 8/24-bit color frame buffer
 .Sh SYNOPSIS
 .Cd "cgfourteen0 at obio0" Pq "SS10-M and SS20"
+.Cd "wsdisplay* at cgfourteen?"
 .Sh DESCRIPTION
 The
-.Nm cgfourteen
-is a memory based color frame buffer, with graphics acceleration and
-overlay capabilities.
-Its pixel memory can be mapped into a user process address space by using the
-.Xr mmap 2
-system call.
-The
 .Nm
-driver supports the minimal
-.Xr ioctl 2 Ns s
-needed to run
-.Xr X 7 .
-.Pp
-The driver operates by default in
-.Xr cgthree 4
-emulation mode, i.e.
-in 8-bit unaccelerated mode.
-This emulation does include support for the hardware cursor present on the
-.Nm cgfourteen ,
-however.
+is a memory based color frame buffer, with graphics acceleration and
+overlay capabilities, for the
+.Xr wscons 4
+console framework.
+It does not provide direct device driver entry points
+but makes its functions available via the internal
+.Xr wsdisplay 4
+interface.
 .Sh SEE ALSO
 .Xr bwtwo 4 ,
 .Xr cgeight 4 ,
 .Xr cgfour 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr cgtwo 4 ,
 .Xr pnozz 4 ,
-.Xr tcx 4
+.Xr tcx 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
diff --git a/share/man/man4/man4.sparc/cgsix.4 b/share/man/man4/man4.sparc/cgsix.4
index e0cab2bb26b..42a836ae61f 100644
--- a/share/man/man4/man4.sparc/cgsix.4
+++ b/share/man/man4/man4.sparc/cgsix.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgsix.4,v 1.13 2002/07/22 07:01:03 miod Exp $
+.\"	$OpenBSD: cgsix.4,v 1.14 2002/08/12 10:48:21 miod Exp $
 .\"	$NetBSD: cgsix.4,v 1.4 1998/06/11 08:32:20 fair Exp $
 .\"
 .\" Copyright 1994
@@ -37,7 +37,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)cgsix.4	8.1 (Berkeley) 2/16/94
-.\"	$Id: cgsix.4,v 1.13 2002/07/22 07:01:03 miod Exp $
+.\"	$Id: cgsix.4,v 1.14 2002/08/12 10:48:21 miod Exp $
 .\"
 .Dd February 16, 1994
 .Dt CGSIX 4 sparc
@@ -49,24 +49,30 @@
 .Cd "cgsix* at sbus? slot ? offset ?" Pq "sun4c and sun4m"
 .Cd "cgsix0 at obio0 addr 0xfb000000 level 4" Pq sun4/300 P4
 .Cd "cgsix0 at obio0 addr 0x0b000000 level 4" Pq sun4/100 P4
+.Cd "wsdisplay* at cgsix?"
 .Sh DESCRIPTION
 The
-.Nm cgsix
-is a memory based color frame buffer.
-It supports the minimal
-.Xr ioctl 2 Ns s
-needed to run
-.Xr X 7 .
+.Nm
+is a memory based color frame buffer for the
+.Xr wscons 4
+console framework.
+It does not provide direct device driver entry points
+but makes its functions available via the internal
+.Xr wsdisplay 4
+interface.
 .Sh SEE ALSO
 .Xr bwtwo 4 ,
 .Xr cgeight 4 ,
 .Xr cgfour 4 ,
 .Xr cgfourteen 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr cgtwo 4 ,
 .Xr pnozz 4 ,
 .Xr sbus 4 ,
-.Xr tcx 4
+.Xr tcx 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
 .Sh BUGS
 Several firmware revisions of the
 .Nm cgsix ,
diff --git a/share/man/man4/man4.sparc/cgthree.4 b/share/man/man4/man4.sparc/cgthree.4
index 713582f3258..67a0cb26289 100644
--- a/share/man/man4/man4.sparc/cgthree.4
+++ b/share/man/man4/man4.sparc/cgthree.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgthree.4,v 1.11 2002/07/22 07:01:03 miod Exp $
+.\"	$OpenBSD: cgthree.4,v 1.12 2002/08/12 10:48:21 miod Exp $
 .\"	$NetBSD: cgthree.4,v 1.4 1998/06/11 08:32:20 fair Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
 .\"
 .\"	from: Header: cgthree.4,v 1.3 94/02/03 20:49:52 leres Exp
 .\"     from: @(#)cgthree.4	8.2 (Berkeley) 2/16/94
-.\"	$Id: cgthree.4,v 1.11 2002/07/22 07:01:03 miod Exp $
+.\"	$Id: cgthree.4,v 1.12 2002/08/12 10:48:21 miod Exp $
 .\"
 .Dd February 16, 1994
 .Dt CGTHREE 4 sparc
@@ -49,21 +49,27 @@
 .Sh SYNOPSIS
 .Cd "cgthree* at sbus? slot ? offset ?"
 .Cd "cgthree* at obio0 slot ? offset ?" Pq some sun4m models
+.Cd "wsdisplay* at cgthree?"
 .Sh DESCRIPTION
 The
 .Nm
-is a memory based color frame buffer.
-It supports the minimal
-.Xr ioctl 2 Ns s
-needed to run
-.Xr X 7 .
+is a memory based color frame buffer for the
+.Xr wscons 4
+console framework.
+It does not provide direct device driver entry points
+but makes its functions available via the internal
+.Xr wsdisplay 4
+interface.
 .Sh SEE ALSO
 .Xr bwtwo 4 ,
 .Xr cgeight 4 ,
 .Xr cgfour 4 ,
 .Xr cgfourteen 4 ,
 .Xr cgsix 4 ,
+.Xr cgtwelve 4 ,
 .Xr cgtwo 4 ,
 .Xr pnozz 4 ,
 .Xr sbus 4 ,
-.Xr tcx 4
+.Xr tcx 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
diff --git a/share/man/man4/man4.sparc/cgtwelve.4 b/share/man/man4/man4.sparc/cgtwelve.4
new file mode 100644
index 00000000000..f1012751fa4
--- /dev/null
+++ b/share/man/man4/man4.sparc/cgtwelve.4
@@ -0,0 +1,59 @@
+.\"	$OpenBSD: cgtwelve.4,v 1.1 2002/08/12 10:48:21 miod Exp $
+.\" Copyright (c) 2002 Miodrag Vallat.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd July 22, 2002
+.Dt CGTWELVE 4 sparc
+.Os
+.Sh NAME
+.Nm cgtwelve
+.Nd accelerated 8/24-bit color frame buffer
+.Sh SYNOPSIS
+.Cd "cgtwelve* at sbus? slot ? offset ?"
+.Cd "wsdisplay* at cgtwelve?"
+.Sh DESCRIPTION
+The
+.Nm
+is a memory based color frame buffer, with graphics acceleration
+and overlay capabilities, for the
+.Xr wscons 4
+console framework.
+It does not provide direct device driver entry points
+but makes its functions available via the internal
+.Xr wsdisplay 4
+interface.
+.Sh SEE ALSO
+.Xr bwtwo 4 ,
+.Xr cgeight 4 ,
+.Xr cgfour 4 ,
+.Xr cgfourteen 4 ,
+.Xr cgsix 4 ,
+.Xr cgthree 4 ,
+.Xr cgtwo 4 ,
+.Xr pnozz 4 ,
+.Xr sbus 4 ,
+.Xr tcx 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
+.Sh CAVEATS
+Vertical scrolling in console mode is abysmally slow.
diff --git a/share/man/man4/man4.sparc/cgtwo.4 b/share/man/man4/man4.sparc/cgtwo.4
index 1cc055aff59..a1000edd39e 100644
--- a/share/man/man4/man4.sparc/cgtwo.4
+++ b/share/man/man4/man4.sparc/cgtwo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cgtwo.4,v 1.9 2002/07/22 07:01:03 miod Exp $
+.\"	$OpenBSD: cgtwo.4,v 1.10 2002/08/12 10:48:21 miod Exp $
 .\"	$NetBSD: cgtwo.4,v 1.3 1997/10/08 22:00:08 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -43,18 +43,17 @@
 .Nd 8-bit color frame buffer
 .Sh SYNOPSIS
 .Cd "cgtwo* at vmes0 addr 0xff400000 level 4 vect 0xa8"
+.Cd "wsdisplay* at cgtwo?"
 .Sh DESCRIPTION
 The
-.Nm cgtwo
-is a memory based color frame buffer.
-Its control pixel memory can be mapped into a user process address
-space by using the
-.Xr mmap 2
-system call.
-The
 .Nm
-driver supports the minimal ioctl's needed to run
-.Xr X 7 .
+is a memory based color frame buffer for the
+.Xr wscons 4
+console framework.
+It does not provide direct device driver entry points
+but makes its functions available via the internal
+.Xr wsdisplay 4
+interface.
 .Sh SEE ALSO
 .Xr bwtwo 4 ,
 .Xr cgeight 4 ,
@@ -62,5 +61,8 @@ driver supports the minimal ioctl's needed to run
 .Xr cgfourteen 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr pnozz 4 ,
-.Xr tcx 4
+.Xr tcx 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
diff --git a/share/man/man4/man4.sparc/kbd.4 b/share/man/man4/man4.sparc/kbd.4
deleted file mode 100644
index 52f2787f1fb..00000000000
--- a/share/man/man4/man4.sparc/kbd.4
+++ /dev/null
@@ -1,176 +0,0 @@
-.\"	$OpenBSD: kbd.4,v 1.7 2001/10/05 14:45:54 mpech Exp $
-.\"	$NetBSD: kbd.4,v 1.3 1997/11/25 22:15:56 pk Exp $
-.\"
-.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Paul Kranenburg.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd June 22, 1996
-.Dt KBD 4 sparc
-.Os
-.Sh NAME
-.Nm kbd
-.Nd workstation keyboard
-.Sh SYNOPSIS
-.Cd "pseudo-device kbd"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides an interface to the workstation console keyboard.
-.Dq type 2 ,
-.Dq type 3 ,
-and
-.Dq type 4
-keyboards are supported.
-All types generate keycodes encoding the key identity and motion (up or down)
-as the keys are pressed and released.
-The
-.Nm
-driver either passes the keycodes to an application as they come in, or
-translates them into ASCII characters first according to a set of built-in
-tables.
-If the keyboard is configured as the device
-to be used for system console input
-.Pq see Xr openprom 4 ,
-it will be internally connected to the
-.Pa /dev/console
-device special file, which can be used as a
-.Xr tty 4
-device.
-The device special file
-.Pa /dev/kbd
-is used to get direct access to the keyboard input stream.
-The following
-.Xr ioctl 2 Ns s
-are supported (mostly just enough to keep the X11 server going):
-.Bl -tag -width KIOCSDIRECT
-.It KIOCTRANS
-Set translation mode.
-The argument is of type
-.Fa "int *" ,
-the only value supported is
-.Dv TR_UNTRANS_EVENT .
-.It KIOCGTRANS
-Get translation mode.
-The argument is of type
-.Fa "int *" .
-.Dv TR_UNTRANS_EVENT
-is always returned.
-.It KIOCGETKEY
-Fill in old-style key station translation.
-The argument is of type
-.Fa "struct okiockey *" .
-.It KIOCCMD
-Send a command to the keyboard.
-The argument is of type
-.Fa "int *" ,
-and can have one of the following values:
-.Bl -tag -width KBD_CMD_NOCLICK
-.It KBD_CMD_BELL
-Start the keyboard beeper.
-.It KBD_CMD_NOBELL
-Stop the keyboard beeper.
-.It KBD_CMD_CLICK
-Instruct the keyboard to make extra noise when touching keys.
-.It KBD_CMD_NOCLICK
-Instruct the keyboard to.. oh well..
-.El
-.It KIOCTYPE
-Get keyboard type.
-The argument is of type
-.Fa "int *" ,
-in which one of the values
-.Dv KB_SUN2 ,
-.Dv KB_SUN3
-or
-.Dv KB_SUN4
-will be returned.
-.It KIOCSDIRECT
-Route the keyboard input stream through the (SunOS) compatible event module.
-The argument is of type
-.Fa "int *" ,
-a non-zero value will put the driver into
-.Dq event
-mode, while a value of zero will make it return to
-.Dq ASCII translation
-mode.
-.It KIOCSKEY
-Set key station translation.
-The argument is of type
-.Fa "struct kiockey *"
-.Pq see Pa /usr/include/machine/kbio.h No for more details .
-.It KIOCGKEY
-Get key station translation.
-The argument is of type
-.Fa "struct kiockey *" .
-.It KIOCLAYOUT
-Get keyboard layout
-.Pq Do type 4 Dc only .
-The argument is of type
-.Fa "char *" ,
-in which the uninterpreted result of the
-.Dv KBD_CMD_GLAYOUT
-keyboard command is returned
-.Po on Dv KBDUN4
-type keyboards this will be the setting of a DIP switch bank
-.Pc .
-.It KIOCSLED
-Set LED state
-.Pq Do type 4 Dc only .
-The argument is of type
-.Fa "char *" ,
-and is the inclusive OR of the following flags:
-.Pp
-.Bl -tag -width LED_SCROLL_LOCK -compact
-.It LED_NUM_LOCK
-.It LED_COMPOSE
-.It LED_SCROLL_LOCK
-.It LED_CAPS_LOCK
-.El
-.Pp
-Each of these flags turn on the LED in the obvious key.
-.It KIOCGLED
-Get LED state
-.Pq Do type 4 Dc only .
-The argument is of type
-.Fa "char *" ,
-in which the current LED state is returned.
-.El
-.Sh SEE ALSO
-.Xr ms 4 ,
-.Xr zs 4
-.Sh BUGS
-.Nm
-is hardwired to the built-in
-.Em zs1
-serial port.
diff --git a/share/man/man4/man4.sparc/ms.4 b/share/man/man4/man4.sparc/ms.4
deleted file mode 100644
index bbd3eb9f8cc..00000000000
--- a/share/man/man4/man4.sparc/ms.4
+++ /dev/null
@@ -1,97 +0,0 @@
-.\"	$OpenBSD: ms.4,v 1.7 2001/10/05 14:45:54 mpech Exp $
-.\"	$NetBSD: ms.4,v 1.2 1997/10/08 22:00:12 jtc Exp $
-.\"
-.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Paul Kranenburg.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd June 22, 1996
-.Dt MS 4 sparc
-.Os
-.Sh NAME
-.Nm ms
-.Nd workstation mouse
-.Sh SYNOPSIS
-.Cd "pseudo-device mouse"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides an interface to the workstation console mouse.
-This
-.Tn Mouse Systems
-three-button device produces five-byte blobs of the form:
-.Pp
-.Bd -literal -offset indent
-b dx dy dx dy
-.Ed
-.Pp
-where
-.Dq b
-is the button state, encoded as
-.Li 0x80|(~buttons)
--- there are three buttons (4=left, 2=middle, 1=right) --
-and
-.Dq \&dx
-and
-.Dq \&dy
-are X and Y delta values, none of which are in the range
-.Bq Li 0x80..0x87 .
-.Pp
-The device special file
-.Pa /dev/mouse
-is used to get direct access to the mouse input stream.
-The following
-.Xr ioctl 2 Ns s
-are supported (mostly just enough to keep the X11 server going):
-.Bl -tag -width VUIDSFORMAT
-.It VUIDSFORMAT
-Set translation mode.
-The argument is of type
-.Fa "int *" ,
-the only value supported is
-.Dv VUID_FIRM_EVENT .
-.It VUIDGFORMAT
-Get translation mode.
-The argument is of type
-.Fa "int *" .
-.Dv VUID_FIRM_EVENT
-is always returned.
-.El
-.Sh SEE ALSO
-.Xr kbd 4 ,
-.Xr zs 4
-.Sh BUGS
-.Nm
-is hardwired to the built-in
-.Em zs1
-serial port.
diff --git a/share/man/man4/man4.sparc/pnozz.4 b/share/man/man4/man4.sparc/pnozz.4
index 0c84137d9ae..80f0a706496 100644
--- a/share/man/man4/man4.sparc/pnozz.4
+++ b/share/man/man4/man4.sparc/pnozz.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: pnozz.4,v 1.6 2002/06/30 21:45:25 deraadt Exp $
+.\"     $OpenBSD: pnozz.4,v 1.7 2002/08/12 10:48:21 miod Exp $
 .\"
 .\" Copyright (c) 1999 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -37,10 +37,13 @@
 .Nd Tadpole Weitek p9100 frame buffer
 .Sh SYNOPSIS
 .Cd "pnozz0 at sbus0 slot ? offset ?"
+.Cd "wsdisplay* at pnozz?"
 .Sh DESCRIPTION
 The
 .Nm
-is a memory based color frame buffer found on
+is a memory based color frame buffer for the
+.Xr wscons 4
+console framework, and found on
 .Tn "Tadpole SPARCbook 3GS and 3GX"
 laptops.
 It is based on the
@@ -48,16 +51,10 @@ It is based on the
 and an
 .Tn "IBM RGB528"
 RAMDAC.
-.Pp
-The
-.Nm pnozz
-is configured to emulate a
-.Xr cgthree 4
-with a resolution of 800x600 with 256 colors.
-It supports the minimal
-.Xr ioctl 2 Ns s
-needed to run
-.Xr X 7 .
+It does not provide direct device driver entry points
+but makes its functions available via the internal
+.Xr wsdisplay 4
+interface.
 .Pp
 If the
 .Xr tctrl 4
@@ -72,10 +69,13 @@ is closed or the screen is blanked.
 .Xr cgfourteen 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr cgtwo 4 ,
 .Xr sbus 4 ,
 .Xr tctrl 4 ,
-.Xr tcx 4
+.Xr tcx 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
 .Sh BUGS
 There is currently no way to switch back and forth from
 the onboard display to the external connector.
diff --git a/share/man/man4/man4.sparc/tcx.4 b/share/man/man4/man4.sparc/tcx.4
index 372ec05d762..29926710d28 100644
--- a/share/man/man4/man4.sparc/tcx.4
+++ b/share/man/man4/man4.sparc/tcx.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcx.4,v 1.12 2002/07/22 07:01:03 miod Exp $
+.\"	$OpenBSD: tcx.4,v 1.13 2002/08/12 10:48:21 miod Exp $
 .\"	$NetBSD: tcx.4,v 1.3 1997/10/08 22:00:14 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -43,24 +43,18 @@
 .Nd accelerated 8/24-bit color frame buffer
 .Sh SYNOPSIS
 .Cd "tcx* at sbus? slot ? offset ?"
+.Cd "wsdisplay* at tcx?"
 .Sh DESCRIPTION
 The
-.Nm tcx
-is a memory based color frame buffer, with graphics acceleration and
-overlay capabilities.
-Its control registers, colour lookup table and pixel memory can be mapped
-into a user process address space by using the
-.Xr mmap 2
-system call.
-The
 .Nm
-driver supports the minimal
-.Xr ioctl 2 Ns s
-needed to run
-.Xr X 7 ,
-and can be operated in
-.Xr cgthree 4
-emulation mode.
+is a memory based color frame buffer, with graphics acceleration and
+overlay capabilities, for the
+.Xr wscons 4
+console framework.
+It does not provide direct device driver entry points
+but makes its functions available via the internal
+.Xr wsdisplay 4
+interface.
 .Sh SEE ALSO
 .Xr bwtwo 4 ,
 .Xr cgeight 4 ,
@@ -68,6 +62,9 @@ emulation mode.
 .Xr cgfourteen 4 ,
 .Xr cgsix 4 ,
 .Xr cgthree 4 ,
+.Xr cgtwelve 4 ,
 .Xr cgtwo 4 ,
 .Xr pnozz 4 ,
-.Xr sbus 4
+.Xr sbus 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
diff --git a/share/man/man4/man4.sparc/zs.4 b/share/man/man4/man4.sparc/zs.4
index f61b40f7fae..6ab0badaf6c 100644
--- a/share/man/man4/man4.sparc/zs.4
+++ b/share/man/man4/man4.sparc/zs.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zs.4,v 1.8 2001/10/05 14:45:54 mpech Exp $
+.\"	$OpenBSD: zs.4,v 1.9 2002/08/12 10:48:21 miod Exp $
 .\"
 .\" Copyright (c) 1998 The OpenBSD Project
 .\" All rights reserved.
@@ -20,16 +20,27 @@
 .Cd "zs1 at obio0 addr 0xf0000000 level 12 flags 0x103" Pq sun4/[23]00
 .Cd "zs1 at obio0 addr 0x00000000 level 12 flags 0x103" Pq sun4/100
 .Cd "zs2 at obio0 addr 0xe0000000 level 12 flags 0x103" Pq sun4/300
+.Cd zstty* at zs? channel ?
+.Cd zskbd* at zs? channel ?
+.Cd wskbd* at zskbd? console ?
 .Sh DESCRIPTION
 The
 .Nm
-is a Zilog 8530 serial interface chip used in Sun workstations.
+is a Zilog 8530 serial interface chip used in
+.Tn Sun
+workstations.
 The Zilog 8530 provides two input/output channels per instance.
-Most Sun workstations include two of these interfaces.
+Most
+.Tn Sun
+workstations include two of these interfaces.
 One of the interfaces is hardwired for use by the keyboard and mouse
 attached to the workstation console.
+The
+.Nm zskbd
+devices connect keyboard devices to the generic keyboard driver
+.Nm wskbd .
 The remaining additional
-.Nm
+.Nm zs
 interfaces provide RS-423
 and RS-232 serial ports for general purpose use.
 .Pp
@@ -54,9 +65,8 @@ connections fail, apparently due to a getty hang.
 The hung getty apparently prevents the cua device from being re-opened.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
-.Xr kbd 4 ,
-.Xr ms 4 ,
-.Xr tty 4
+.Xr tty 4 ,
+.Xr wskbd 4
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/wsdisplay.4 b/share/man/man4/wsdisplay.4
index 47092b3fa08..df093c982e5 100644
--- a/share/man/man4/wsdisplay.4
+++ b/share/man/man4/wsdisplay.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wsdisplay.4,v 1.10 2002/06/30 21:45:25 deraadt Exp $
+.\" $OpenBSD: wsdisplay.4,v 1.11 2002/08/12 10:48:18 miod Exp $
 .\" $NetBSD: wsdisplay.4,v 1.5 2000/05/13 15:22:19 mycroft Exp $
 .\"
 .Dd March 20, 1999
@@ -8,19 +8,35 @@
 .Nm wsdisplay
 .Nd generic display device support in wscons
 .Sh SYNOPSIS
-.Cd wsdisplay* at ega? console ?
-(EGA display on ISA)
+.\".Cd wsdisplay* at ega? console ?
+.\"(EGA display on ISA)
 .Cd wsdisplay* at vga? console ?
-(VGA display on ISA or PCI)
+(VGA textmode display on ISA or PCI)
 .Cd wsdisplay* at pcdisplay? console ?
 (generic PC (ISA) display)
+.Cd wsdisplay* at vgafb? console ?
+(VGA graphics display on PCI, as found on macppc and sparc64 platforms)
 .Cd wsdisplay* at tga? console ?
 (DEC TGA display, alpha only)
-.Cd wsdisplay* at nextdisplay? console ?
-(NeXT display)
+.\" .Cd wsdisplay* at nextdisplay? console ?
+.\" (NeXT display)
 .Cd wsdisplay* at sti? console ?
 (HP CRX and Visualize series framebuffers)
-.Cd wsdisplay0 at smg0
+.Cd wsdisplay* at bwtwo? console ?
+.Cd wsdisplay* at cgtwo? console ?
+.Cd wsdisplay* at cgthree? console ?
+.Cd wsdisplay* at cgfour? console ?
+.Cd wsdisplay* at cgsix? console ?
+.Cd wsdisplay* at cgeight? console ?
+.Cd wsdisplay* at cgtwelve? console ?
+.Cd wsdisplay* at cgfourteen? console ?
+.Cd wsdisplay* at pnozz? console ?
+.Cd wsdisplay* at tcx? console ?
+(sparc and/or sparc64 framebuffers)
+.Cd wsdisplay* at creator? console ?
+.Cd wsdisplay* at vgfab? console ?
+(sparc64 framebuffers)
+.Cd wsdisplay0 at smg? console ?
 (VAXstation small monochrome display)
 .Cd options WSDISPLAY_DEFAULTSCREENS=N
 .Sh DESCRIPTION
@@ -132,11 +148,23 @@ control device
 .It Pa /usr/include/dev/wscons/wsconsio.h
 .El
 .Sh SEE ALSO
+.Xr bwtwo 4 ,
+.Xr cgtwo 4 ,
+.Xr cgthree 4 ,
+.Xr cgfour 4 ,
+.Xr cgsix 4 ,
+.Xr cgeight 4 ,
+.Xr cgtwelve 4 ,
+.Xr cgfourteen 4 ,
+.Xr creator 4 ,
 .Xr pcdisplay 4 ,
+.Xr pnozz 4 ,
 .Xr sti 4 ,
+.Xr tcx 4 ,
 .Xr tga 4 ,
 .Xr tty 4 ,
 .Xr vga 4 ,
+.Xr vgafb 4 ,
 .Xr wscons 4 ,
 .Xr wsconscfg 8 ,
 .Xr wsconsctl 8 ,
diff --git a/share/man/man4/wskbd.4 b/share/man/man4/wskbd.4
index c8346e7c5de..f9cc446053d 100644
--- a/share/man/man4/wskbd.4
+++ b/share/man/man4/wskbd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wskbd.4,v 1.5 2001/06/08 04:08:26 aaron Exp $
+.\" $OpenBSD: wskbd.4,v 1.6 2002/08/12 10:48:18 miod Exp $
 .\" $NetBSD: wskbd.4,v 1.5 2000/03/20 11:51:59 pk Exp $
 .\"
 .Dd March 20, 1999
@@ -8,9 +8,15 @@
 .Nm wskbd
 .Nd generic keyboard support in wscons
 .Sh SYNOPSIS
-.Cd "wskbd* at pckbd? console ? mux 1"
-.Cd "wskbd* at ukbd? console ? mux 1"
-.Cd "wskbd0 at akbd? console ? mux 1"
+.Cd wskbd* at pckbd? console ? mux 1
+(PS/2 keyboard)
+.Cd wskbd* at ukbd? console ? mux 1
+(USB keyboard)
+.Cd wskbd* at akbd? console ? mux 1
+(Apple ADB keyboard)
+.Cd wskbd* at comkbd? console ? mux 1
+.Cd wskbd* at zskbd? console ? mux 1
+(Sun serial keyboard)
 .Sh DESCRIPTION
 The
 .Nm
@@ -108,8 +114,11 @@ driver supports it.
 .It Pa /usr/include/dev/wscons/wsconsio.h
 .El
 .Sh SEE ALSO
+.Xr akbd 4 ,
+.Xr comkbd 4 ,
 .Xr wscons 4 ,
 .Xr wsmux 4 ,
 .Xr pckbd 4 ,
 .Xr ukbd 4 ,
+.Xr zskbd 4 ,
 .Xr wsconsctl 8