akbd and ams are mi drivers now, move manpages up; also sync akbd

layouts list with reality.

7 files changed, 18 insertions, 252 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index e53b5872792..a7cb6475a9c 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,9 +1,10 @@
-#	$OpenBSD: Makefile,v 1.336 2006/01/15 12:36:30 kettenis Exp $
+#	$OpenBSD: Makefile,v 1.337 2006/01/18 23:27:04 miod Exp $
 
 MAN=	aac.4 ac97.4 acphy.4 acpi.4 acpitimer.4 \
 	adc.4 addcom.4 admcts.4 admlc.4 admtemp.4 \
 	admtm.4 admtmp.4 admtt.4 adt.4 adv.4 aha.4 ahb.4 ahc.4 ahd.4 aic.4 \
-	alipm.4 amdiic.4 amdpm.4 ami.4 amphy.4 an.4 aps.4 aria.4 art.4 \
+	akbd.4 alipm.4 amdiic.4 amdpm.4 ami.4 amphy.4 ams.4 \
+	an.4 aps.4 aria.4 art.4 \
 	asbtm.4 ast.4 atalk.4 atapiscsi.4 ath.4 atu.4 atw.4 audio.4 aue.4 \
 	auich.4 autri.4 auixp.4 auvia.4 awi.4 axe.4 az.4 bce.4 bge.4 bha.4 \
 	bio.4 bktr.4 bmtphy.4 boca.4 bpf.4 brgphy.4 bridge.4 cac.4 \
diff --git a/share/man/man4/man4.macppc/akbd.4 b/share/man/man4/akbd.4
index b30aa80f951..e96bdc7d04d 100644
--- a/share/man/man4/man4.macppc/akbd.4
+++ b/share/man/man4/akbd.4
@@ -29,11 +29,11 @@
 .\" (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.10 2005/05/20 08:58:43 jmc Exp $
+.\"	$OpenBSD: akbd.4,v 1.1 2006/01/18 23:27:05 miod Exp $
 .\"	$NetBSD: adb.4,v 1.1 1997/07/18 02:13:42 ender Exp $
 .\"
-.Dd May 4, 2005
-.Dt AKBD 4 macppc
+.Dd January 18, 2006
+.Dt AKBD 4
 .Os
 .Sh NAME
 .Nm akbd
@@ -97,6 +97,10 @@ The built-in mappings are at this time:
 .Dq de
 ) German with
 .Dq dead accents .
+.It KB_ES
+(
+.Dq es
+) Spanish.
 .It KB_FR
 (
 .Dq fr
@@ -134,7 +138,7 @@ The built-in mappings are at this time:
 ) English / US keyboard mapping (default).
 .El
 .Pp
-The KB_DE, KB_SG and KB_SV mappings can be used in the KB_NODEAD (
+The KB_DE, KB_FR, KB_SG and KB_SV mappings can be used in the KB_NODEAD (
 .Dq .nodead
 ) variant.
 This switches off the
diff --git a/share/man/man4/man4.macppc/ams.4 b/share/man/man4/ams.4
index 019525c4f62..a9627c369b5 100644
--- a/share/man/man4/man4.macppc/ams.4
+++ b/share/man/man4/ams.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ams.4,v 1.5 2003/06/06 10:29:42 jmc Exp $
+.\" $OpenBSD: ams.4,v 1.1 2006/01/18 23:27:05 miod Exp $
 .\"
 .\" Copyright (c) 2001 Peter Philipp
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd July 30, 2001
-.Dt AMS 4 macppc
+.Dt AMS 4
 .Os
 .Sh NAME
 .Nm ams
@@ -45,7 +45,7 @@ mice, trackballs, trackpads and tablets.
 .It
 Extended Mouse Protocol
 .It
-Mouse Systems A^3 Mouse
+Mouse Systems A3 Mouse
 .It
 MicroSpeed Mouse Deluxe
 .It
diff --git a/share/man/man4/man4.mac68k/Makefile b/share/man/man4/man4.mac68k/Makefile
index 545533b5c14..000896da32a 100644
--- a/share/man/man4/man4.mac68k/Makefile
+++ b/share/man/man4/man4.mac68k/Makefile
@@ -1,7 +1,7 @@
 #	from: @(#)Makefile	5.1 (Berkeley) 6/29/90
-#	$OpenBSD: Makefile,v 1.13 2006/01/10 07:37:31 miod Exp $
+#	$OpenBSD: Makefile,v 1.14 2006/01/18 23:27:11 miod Exp $
 
-MAN=	adb.4 ae.4 akbd.4 ams.4 asc.4 autoconf.4 esp.4 intro.4 \
+MAN=	adb.4 ae.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 \
diff --git a/share/man/man4/man4.mac68k/akbd.4 b/share/man/man4/man4.mac68k/akbd.4
deleted file mode 100644
index d6b70c4b2bc..00000000000
--- a/share/man/man4/man4.mac68k/akbd.4
+++ /dev/null
@@ -1,171 +0,0 @@
-.\"
-.\" 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
deleted file mode 100644
index 3091f367d69..00000000000
--- a/share/man/man4/man4.mac68k/ams.4
+++ /dev/null
@@ -1,68 +0,0 @@
-.\" $OpenBSD: ams.4,v 1.2 2006/01/11 22:54:49 jmc 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 A3 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.macppc/Makefile b/share/man/man4/man4.macppc/Makefile
index dc26c8f7eaf..8daa1bcd36d 100644
--- a/share/man/man4/man4.macppc/Makefile
+++ b/share/man/man4/man4.macppc/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.20 2006/01/03 17:24:59 xsa Exp $
+#	$OpenBSD: Makefile,v 1.21 2006/01/18 23:27:11 miod Exp $
 #	from: @(#)Makefile	5.1 (Berkeley) 2/12/91
 #	Id: Makefile,v 1.4 1995/12/14 05:41:38 deraadt Exp $
 
-MAN=	abtn.4 adb.4 akbd.4 ams.4 aoa.4 apm.4 asms.4 autoconf.4 awacs.4 bm.4 \
+MAN=	abtn.4 adb.4 aoa.4 apm.4 asms.4 autoconf.4 awacs.4 bm.4 \
 	daca.4 fcu.4 ht.4 intro.4 kauaiata.4 ki2c.4 macobio.4 \
 	mediabay.4 mem.4 onyx.4 pi2c.4 smu.4 snapper.4 tpms.4 tumbler.4 zs.4
 MLINKS= mem.4 kmem.4