Manpage updates for recent wscons developments.

8 files changed, 306 insertions, 220 deletions

diff --git a/share/man/man4/man4.mac68k/Makefile b/share/man/man4/man4.mac68k/Makefile
index 922b8d7e923..545533b5c14 100644
--- a/share/man/man4/man4.mac68k/Makefile
+++ b/share/man/man4/man4.mac68k/Makefile
@@ -1,8 +1,8 @@
 #	from: @(#)Makefile	5.1 (Berkeley) 6/29/90
-#	$OpenBSD: Makefile,v 1.12 2005/02/27 22:11:03 martin Exp $
+#	$OpenBSD: Makefile,v 1.13 2006/01/10 07:37:31 miod Exp $
 
-# TODO intvid macvid grf ite
-MAN=	adb.4 ae.4 asc.4 autoconf.4 esp.4 intro.4 mainbus.4 mc.4 mem.4 \
+MAN=	adb.4 ae.4 akbd.4 ams.4 asc.4 autoconf.4 esp.4 intro.4 \
+	macfb.4 mainbus.4 mc.4 mem.4 \
 	ncrscsi.4 nubus.4 obio.4 sn.4 zsc.4
 MLINKS=	mem.4 kmem.4 \
 	ncrscsi.4 sbc.4 \
diff --git a/share/man/man4/man4.mac68k/adb.4 b/share/man/man4/man4.mac68k/adb.4
index 184daf6b4d5..1347f97dd31 100644
--- a/share/man/man4/man4.mac68k/adb.4
+++ b/share/man/man4/man4.mac68k/adb.4
@@ -28,19 +28,19 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: adb.4,v 1.9 2004/03/20 22:13:48 miod Exp $
+.\"	$OpenBSD: adb.4,v 1.10 2006/01/10 07:37:31 miod Exp $
 .\"	$NetBSD: adb.4,v 1.1 1997/07/18 02:13:42 ender Exp $
 .\"
-.Dd July 17, 1997
+.Dd January 10, 2006
 .Dt ADB 4 mac68k
 .Os
 .Sh NAME
 .Nm adb
-.Nd Apple Desktop Bus event interface
+.Nd Apple Desktop Bus driver
 .Sh SYNOPSIS
 .Cd "adb0 at obio?"
-.Cd "#option MRG_ADB" Pq "use ROM-based ADB driver"
-.Fd #include <machine/adbsys.h>
+.Cd "akbd* at adb?"
+.Cd "ams* at adb?"
 .Sh DESCRIPTION
 The Apple Desktop Bus
 .Pq Tn ADB
@@ -48,202 +48,9 @@ is the single-master, multiple-slave, low-speed serial bus
 interface used by Macintosh computers to connect input devices
 such as keyboards, mice, trackballs, and graphics tablets
 to the machine.
-.Pp
-The
-.Nm
-device is the sole interface to user input.
-It combines both keyboard and mouse drivers into one event driver.
-All user input is obtained by doing a
-.Xr read 2
-on the
-.Nm
-device.
-Since most Macintosh mice have only one button, the
-.Nm
-driver will emulate a second and third mouse button with
-the keyboard.
-The
-.Nm
-device only supports being opened by one process at a time.
-.Pp
-There are two interfaces to the
-.Tn ADB
-hardware supported by the
-.Nm
-driver.
-The older of the two relies on information in the Macintosh
-.Tn ROM
-to interface with the hardware.
-This method is only available if the
-.Dv MRG_ADB
-option is defined in the kernel configuration file.
-The newer method interfaces directly with the
-.Tn VIA
-hardware and with the Power Manager hardware if it is
-present
-.Pq e.g. on the PowerBooks .
-The default configuration currently uses the
-Macintosh
-.Tn ROM
-Glue
-.Pq Tn MRG
-method.
-.Pp
-The
-.Xr ioctl 2
-call is used to control the
-.Tn ADB
-event device.
-The following is a list of available
-.Xr ioctl 2
-commands:
-.Bl -tag -width ADBIOC_GETREPEAT
-.It Dv ADBIOC_DEVSINFO
-Get
-.Tn ADB
-Device Info
-.Pp
-The
-.Nm
-event device will return an array of information containing an entry
-for each device connected to the bus.
-Each entry contains the current address, default address, and handler ID for
-the corresponding
-.Tn ADB
-device.
-.It Dv ADBIOC_GETREPEAT
-Get Keyboard Repeat Info
-.Pp
-Returns a structure containing the current keyboard repeat delay
-and keyboard repeat interval.
-.It Dv ADBIOC_SETREPEAT
-Set Keyboard Repeat Rate
-.Pp
-Sets the keyboard repeat delay and interval to the values specified
-by
-.Ar argp .
-.It Dv ADBIOC_RESET
-.Tn ADB
-Reset
-.Pp
-Perform a reset of the
-.Tn ADB
-which will reinitialize all of the devices attached to the bus.
-.It Dv ADBIOC_LISTENCMD
-ADB Listen Command
-.Pp
-Send data to the register of the
-.Tn ADB
-device specified by
-.Ar argp .
-This command is not fully implemented at this time.
-.El
-.Sh HARDWARE
-The
-.Nm
-device supports the ADB hardware of most m68k-based
-Macintosh models,
-including the II-series, Centris- and Quadra-series, PowerBook-
-and Duo-series, LC-series, and Performa-series models.
-.Pp
-Most standard
-.Tn ADB
-devices are supported by the
-.Nm
-driver, including mice which follow Apple's
-Extended Mouse Protocol.
-Many multi-button mice which follow a proprietary protocol are
-not currently supported in multi-button mode.
-The following is a partial list of supported
-.Tn ADB
-devices:
-.Bd -filled -offset indent
-.Bl -item -compact
-.It
-Apple Standard Keyboard
-.It
-Apple Extended Keyboard
-.It
-Apple Adjustable Keyboard
-.It
-Apple Desktop Bus Mouse
-.It
-Logitech TrackMan
-.It
-Logitech MouseMan
-.It
-Microspeed Mouse Deluxe
-.It
-Mouse Systems A3 Mouse
-.El
-.Ed
-.Sh FILES
-.Bl -tag -width /dev/adb -compact
-.It Pa /dev/adb
-The
-.Tn ADB
-event device.
-.El
-.Sh DIAGNOSTICS
-.Bl -diag -compact
-.It adb0 at obio0 (ADB event device).
-This is a normal autoconfiguration message noting the presence of the
-.Nm
-event device.
-.It adb: bus subsystem.
-A standard autoconfiguration message indicating the initialization
-of the
-.Tn ADB
-subsystem.
-.It adb: no devices found.
-No
-.Tn ADB
-devices were found to be connected to the bus during autoconfiguration.
-.It adb: using %s series hardware support.
-Indicates the class of
-.Tn ADB
-hardware support the machine uses.
-.It adb: hardware type unknown for this machine.
-The
-.Tn ADB
-hardware in this machine is currently unsupported.
-.It "adb: no ROM ADB driver in this kernel for this machine."
-The kernel lacks the necessary Macintosh ROM Glue
-.Pq Tn MRG
-support for accessing the
-.Tn ADB
-hardware on this machine.
-.It adb: using serial console.
-A serial console will be used for user input rather than the
-.Tn ADB
-event device.
-.It adb: %s at %d.
-An
-.Tn ADB
-device of the type specified by
-.Em %s
-has been found at location
-.Em %d .
-.El
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ENXIO
-No such
-.Tn ADB
-event device.
-.It Bq Er EBUSY
-Another process has the device open.
-.It Bq Er EINVAL
-Invalid
-.Xr ioctl 2
-specification.
-.It Bq Er EMSGSIZE
-The size of the
-.Tn ADB
-event being read is too large to fit into the buffer
-allocated to it.
-.El
 .Sh SEE ALSO
+.Xr akbd 4 ,
+.Xr ams 4 ,
 .Xr intro 4
 .Sh HISTORY
 The
@@ -269,13 +76,4 @@ hardware is supported yet.
 The talk command is currently unimplemented.
 .It
 The listen command is not implemented yet.
-.It
-Not all multi-button mice are currently supported.
-.It
-Only mapped and relative-position
-.Tn ADB
-devices
-.Pq i.e. keyboards and mice
-are supported.
-Thus absolute-position and other exotic devices will not work.
 .El
diff --git a/share/man/man4/man4.mac68k/akbd.4 b/share/man/man4/man4.mac68k/akbd.4
new file mode 100644
index 00000000000..d6b70c4b2bc
--- /dev/null
+++ b/share/man/man4/man4.mac68k/akbd.4
@@ -0,0 +1,171 @@
+.\"
+.\" Copyright (c) 2001 Peter Philipp
+.\" Copyright (c) 1997 Colin Wood
+.\" 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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"      This product includes software developed by Colin Wood
+.\"      for the NetBSD Project.
+.\" 4. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission
+.\"
+.\" 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.
+.\"
+.\"	$OpenBSD: akbd.4,v 1.1 2006/01/10 07:37:31 miod Exp $
+.\"	$NetBSD: adb.4,v 1.1 1997/07/18 02:13:42 ender Exp $
+.\"
+.Dd January 10, 2006
+.Dt AKBD 4 mac68k
+.Os
+.Sh NAME
+.Nm akbd
+.Nd Apple Keyboard Device
+.Sh SYNOPSIS
+.Cd "akbd* at adb?"
+.Cd "wskbd* at akbd? mux 1"
+.Cd "option AKBD_LAYOUT=XXX"
+.Sh DESCRIPTION
+This driver supports ADB keyboards within the
+.Xr wscons 4
+console framework.
+It doesn't provide direct device driver entry points but makes its
+functions available via the internal
+.Xr wskbd 4
+interface.
+.Pp
+The following is a partial list of supported
+.Tn AKBD
+devices:
+.Bd -filled -offset indent
+.Bl -item -compact
+.It
+Apple Standard Keyboard
+.It
+Apple Extended Keyboard
+.It
+Apple Keyboard II
+.It
+Apple PowerBook Keyboard
+.It
+Apple Adjustable Keyboard
+.\" .It
+.\" Apple PowerBook extended Keyboard
+.\" .It
+.\" Apple PowerBook G3 Keyboard
+.\" .It
+.\" Apple PowerBook G4 Keyboard
+.\" .It
+.\" Apple iBook Keyboard
+.El
+.Ed
+.Pp
+The
+.Nm
+driver supports a number of different key mappings which
+can be chosen from with the kernel option
+.Dq AKBD_LAYOUT
+at compile time or with the utility
+.Xr wsconsctl 8
+(variable:
+.Dq keyboard.encoding
+) at runtime.
+Other mappings can be used if the whole keymap is replaced by means of
+.Xr wsconsctl 8 .
+The built-in mappings are at this time:
+.Bl -hang
+.It KB_DE
+(
+.Dq de
+) German with
+.Dq dead accents .
+.It KB_FR
+(
+.Dq fr
+) French.
+.It KB_JP
+(
+.Dq jp
+) Japanese.
+.It KB_PT
+(
+.Dq pt
+) Portuguese.
+.It KB_SF
+(
+.Dq sf
+) Swiss French with
+.Dq dead accents .
+.It KB_SG
+(
+.Dq sg
+) Swiss German with
+.Dq dead accents .
+.It KB_SV
+(
+.Dq sv
+) Swedish with
+.Dq dead accents .
+.It KB_UK
+(
+.Dq uk
+) British.
+.It KB_US
+(
+.Dq us
+) English / US keyboard mapping (default).
+.El
+.Pp
+The KB_DE, KB_SG and KB_SV mappings can be used in the KB_NODEAD (
+.Dq .nodead
+) variant.
+This switches off the
+.Dq dead accents .
+.Sh EXAMPLES
+To set a German keyboard layout without
+.Dq dead accents ,
+use
+.Ic wsconsctl -w keyboard.encoding=de.nodead .
+To set it at kernel build time, add
+the following to the kernel configuration file:
+.Bd -literal -offset indent
+option AKBD_LAYOUT="KB_DE|KB_NODEAD"
+.Ed
+.Sh SEE ALSO
+.Xr adb 4 ,
+.Xr intro 4 ,
+.Xr wskbd 4 ,
+.Xr wsconsctl 8
+.Sh HISTORY
+The
+.Nm
+interface first appeared in
+.Nx 0.9 .
+It has been under development ever since.
+.Sh AUTHORS
+Bradley A. Grantham wrote the original
+.Nm
+driver, including the
+.Tn MRG
+support.
+The hardware direct interface was written by John P. Wittkowski.
+.Sh BUGS
+The list of built-in mappings doesn't follow any logic.
+It grew as people submitted what they needed.
diff --git a/share/man/man4/man4.mac68k/ams.4 b/share/man/man4/man4.mac68k/ams.4
new file mode 100644
index 00000000000..5209819f726
--- /dev/null
+++ b/share/man/man4/man4.mac68k/ams.4
@@ -0,0 +1,68 @@
+.\" $OpenBSD: ams.4,v 1.1 2006/01/10 07:37:31 miod Exp $
+.\"
+.\" Copyright (c) 2001 Peter Philipp
+.\" 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.
+.\" 3. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission
+.\"
+.\" 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 January 10, 2006
+.Dt AMS 4 mac68k
+.Os
+.Sh NAME
+.Nm ams
+.Nd Apple Mouse Support
+.Sh SYNOPSIS
+.Cd "ams* at adb?"
+.Cd "wsmouse at ams? mux 0"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports a series of
+.Xr adb 4
+mice, trackballs, trackpads and tablets.
+.Pp
+.Bl -bullet -compact
+.It
+Extended Mouse Protocol
+.It
+Mouse Systems A^3 Mouse
+.It
+MicroSpeed Mouse Deluxe
+.It
+Contour mouse
+.It
+Kensington Turbo Mouse
+.It
+Logitech non-EMP Mouseman
+.It
+TrackMan trackball
+.El
+.Sh SEE ALSO
+.Xr adb 4 ,
+.Xr intro 4 ,
+.Xr wsmouse 4
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.Sy Colin Wood .
diff --git a/share/man/man4/man4.mac68k/intro.4 b/share/man/man4/man4.mac68k/intro.4
index 2d04bcc9786..ad8ddbce10c 100644
--- a/share/man/man4/man4.mac68k/intro.4
+++ b/share/man/man4/man4.mac68k/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.14 2004/08/15 22:52:41 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.15 2006/01/10 07:37:31 miod Exp $
 .\"	$NetBSD: intro.4,v 1.4 1997/03/28 00:29:35 veego Exp $
 .\"
 .\" Copyright (c) 1990, 1991 Regents of the University of California.
@@ -108,10 +108,8 @@ Apple Sound Chip.
 .It Xr esp 4
 .Tn NCR
 53C9x built-in SCSI interface.
-.It Xr grf 4
+.It Xr macfb 4
 On-board and NuBus-based video interface.
-.It Xr ite 4
-Mac68k Internal Terminal Emulator.
 .It Xr mc 4
 MACE Ethernet interface.
 .It Xr ncrscsi 4
diff --git a/share/man/man4/man4.mac68k/macfb.4 b/share/man/man4/man4.mac68k/macfb.4
new file mode 100644
index 00000000000..d41dd727bc4
--- /dev/null
+++ b/share/man/man4/man4.mac68k/macfb.4
@@ -0,0 +1,51 @@
+.\"	$OpenBSD: macfb.4,v 1.1 2006/01/10 07:37:31 miod Exp $
+.\"
+.\" Copyright (c) 2006, Miodrag Vallat
+.\"
+.\" 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 January 10, 2006
+.Dt MACFB 4 mac68k
+.Os
+.Sh NAME
+.Nm macfb
+.Nd Macintosh frame buffers
+.Sh SYNOPSIS
+.Cd "macfb* at obio?"
+.Cd "macfb* at nubus?"
+.Sh DESCRIPTION
+The
+.Nm
+driver handles on-board and
+.Tn Nubus
+video frame buffers within the
+.Xr wscons 4
+console framework.
+.Pp
+All possible video modes are supported, but it is not possible to change
+resolution or color depth on the fly under
+.Ox .
+.Sh SEE ALSO
+.Xr intro 4 ,
+.Xr nubus 4 ,
+.Xr wscons 4 ,
+.Xr wsdisplay 4
diff --git a/share/man/man4/man4.mac68k/nubus.4 b/share/man/man4/man4.mac68k/nubus.4
index 653b0f18a84..1f27e2df21f 100644
--- a/share/man/man4/man4.mac68k/nubus.4
+++ b/share/man/man4/man4.mac68k/nubus.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nubus.4,v 1.1 2005/02/27 22:11:03 martin Exp $
+.\"	$OpenBSD: nubus.4,v 1.2 2006/01/10 07:37:31 miod Exp $
 .\"
 .\" Copyright (c) 2004 Martin Reindl <martin@openbsd.org>
 .\"
@@ -33,7 +33,7 @@ The
 mechanical properties of the extension slots.
 .Sh SEE ALSO
 .Xr ae 4 ,
-.\" .Xr macvid 4 ,
+.Xr macfb 4 ,
 .Xr sn 4
 .Sh HISTORY
 The
diff --git a/share/man/man4/man4.mac68k/obio.4 b/share/man/man4/man4.mac68k/obio.4
index c540b8104aa..411c28c269b 100644
--- a/share/man/man4/man4.mac68k/obio.4
+++ b/share/man/man4/man4.mac68k/obio.4
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: obio.4,v 1.13 2005/02/27 22:11:03 martin Exp $
+.\"	$OpenBSD: obio.4,v 1.14 2006/01/10 07:37:31 miod Exp $
 .\"	$NetBSD: obio.4,v 1.1 1997/07/18 02:13:40 ender Exp $
 .\"
 .Dd July 2, 1997
@@ -53,7 +53,7 @@ onboard I/O bus.
 .Xr asc 4 ,
 .Xr esp 4 ,
 .Xr intro 4 ,
-.\" .Xr intvid 4 ,
+.Xr macfb 4 ,
 .Xr mainbus 4 ,
 .Xr mc 4 ,
 .Xr ncrscsi 4 ,