Driver for the Apollo Domain keyboard and mouse, for the HP 9000/4xx series.

Claims the console keyboard if a keyboard is detected at boot time,
otherwise HIL is preferred (but due to wsmux both can be used simultaneously).

7 files changed, 90 insertions, 16 deletions

diff --git a/share/man/man4/man4.hp300/Makefile b/share/man/man4/man4.hp300/Makefile
index eaf3807f2f0..a74e18e669a 100644
--- a/share/man/man4/man4.hp300/Makefile
+++ b/share/man/man4/man4.hp300/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.11 2005/01/14 22:39:21 miod Exp $
+#	$OpenBSD: Makefile,v 1.12 2005/04/22 11:59:10 miod Exp $
 #	from: @(#)Makefile	5.1 (Berkeley) 6/29/90
 
-MAN=	apci.4 autoconf.4 ct.4 dca.4 dcm.4 dio.4 dvbox.4 frodo.4 gbox.4 \
-	hd.4 hyper.4 intro.4 le.4 mem.4 nhpib.4 ppi.4 rbox.4 sgc.4 spc.4 \
-	topcat.4
+MAN=	apci.4 autoconf.4 ct.4 dca.4 dcm.4 dio.4 dnkbd.4 dvbox.4 \
+	frodo.4 gbox.4 hd.4 hyper.4 intro.4 le.4 mem.4 \
+	nhpib.4 ppi.4 rbox.4 sgc.4 spc.4 topcat.4
 MLINKS=	mem.4 kmem.4
 MLINKS+=nhpib.4 fhpib.4 nhpib.4 hpibbus.4
 MANSUBDIR=hp300
diff --git a/share/man/man4/man4.hp300/apci.4 b/share/man/man4/man4.hp300/apci.4
index 359bd1df448..2e3cb44b582 100644
--- a/share/man/man4/man4.hp300/apci.4
+++ b/share/man/man4/man4.hp300/apci.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apci.4,v 1.8 2004/09/30 19:59:26 mickey Exp $
+.\"	$OpenBSD: apci.4,v 1.9 2005/04/22 11:59:10 miod Exp $
 .\
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -73,6 +73,7 @@ has overflowed and incoming data has been lost.
 .Sh SEE ALSO
 .Xr dca 4 ,
 .Xr dcm 4 ,
+.Xr dnkbd 4 ,
 .Xr frodo 4 ,
 .Xr intro 4 ,
 .Xr tty 4
diff --git a/share/man/man4/man4.hp300/dnkbd.4 b/share/man/man4/man4.hp300/dnkbd.4
new file mode 100644
index 00000000000..f951801f8ae
--- /dev/null
+++ b/share/man/man4/man4.hp300/dnkbd.4
@@ -0,0 +1,63 @@
+.\"	$OpenBSD: dnkbd.4,v 1.1 2005/04/22 11:59:10 miod Exp $
+.\"
+.\" Copyright (c) 2005, 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 April 22, 2005
+.Dt DNKBD 4 HP300
+.Os
+.Sh NAME
+.Nm dnkbd
+.Nd Apollo Domain keyboard and mouse
+.Sh SYNOPSIS
+.Cd "dnkbd0   at frodo?"
+.Cd "wskbd*   at dnkbd? mux 1"
+.Cd "wsmouse* at dnkbd? mux 0"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the first 8250-like UART connected to the
+.Xr frodo 4
+Apollo utility chip;
+this UART is physically connected to the
+.Sq Domain keyboard
+connector.
+The Apollo mouse plugs itself in a dedicated connector on the top left of
+the keyboard.
+.Pp
+The
+.Nm
+driver doesn't provide any direct entry point, but makes its functionnality
+available through the internal
+.Xr wskbd 4
+and
+.Xr wsmouse 4
+interfaces.
+.Sh SEE ALSO
+.Xr apci 4 ,
+.Xr frodo 4 ,
+.Xr hilkbd 4 ,
+.Xr hilms 4 ,
+.Xr intro 4 ,
+.Xr wskbd 4 ,
+.Xr wsconsctl 8
diff --git a/share/man/man4/man4.hp300/frodo.4 b/share/man/man4/man4.hp300/frodo.4
index a84f9adaa0b..595b0672ad9 100644
--- a/share/man/man4/man4.hp300/frodo.4
+++ b/share/man/man4/man4.hp300/frodo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: frodo.4,v 1.2 2004/09/30 19:59:26 mickey Exp $
+.\"	$OpenBSD: frodo.4,v 1.3 2005/04/22 11:59:10 miod Exp $
 .\"
 .\" Copyright (c) 2003, Miodrag Vallat.
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 16, 2003
+.Dd April 22, 2005
 .Dt FRODO 4 hp300
 .Os
 .Sh NAME
@@ -33,6 +33,7 @@
 .Sh SYNOPSIS
 .Cd "frodo0 at intio?"
 .Cd "apci* at frodo?"
+.Cd "dnkbd0 at frodo?"
 .Sh DESCRIPTION
 The
 .Tn FRODO
@@ -45,7 +46,5 @@ serial ports, the first one being used to connect the
 Domain keyboard.
 .Sh SEE ALSO
 .Xr apci 4 ,
-.\" .Xr dnkbd 4 ,
+.Xr dnkbd 4 ,
 .Xr intro 4
-.Sh BUGS
-The Domain keyboard is currently only supported by the boot blocks.
diff --git a/share/man/man4/man4.hp300/intro.4 b/share/man/man4/man4.hp300/intro.4
index 926e5066dce..0c23e3afdaa 100644
--- a/share/man/man4/man4.hp300/intro.4
+++ b/share/man/man4/man4.hp300/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.21 2005/01/14 22:39:21 miod Exp $
+.\"	$OpenBSD: intro.4,v 1.22 2005/04/22 11:59:10 miod Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     from: @(#)intro.4	8.1 (Berkeley) 6/5/93
 .\"
-.Dd January 12, 2005
+.Dd April 22, 2005
 .Dt INTRO 4 hp300
 .Os
 .Sh NAME
@@ -115,6 +115,8 @@ Apollo utility chip serial interface.
 HP 98642A communications multiplexer.
 .It Xr dio 4
 DIO/DIO-II bus.
+.It Xr dnkbd 4
+Apollo Domain keyboard and mouse.
 .It Xr dvbox 4
 .Tn HP98730
 .Dq DaVinci
diff --git a/share/man/man4/wskbd.4 b/share/man/man4/wskbd.4
index 57f4fac1d68..955077b6862 100644
--- a/share/man/man4/wskbd.4
+++ b/share/man/man4/wskbd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wskbd.4,v 1.15 2005/04/01 02:07:07 uwe Exp $
+.\" $OpenBSD: wskbd.4,v 1.16 2005/04/22 11:59:10 miod Exp $
 .\" $NetBSD: wskbd.4,v 1.5 2000/03/20 11:51:59 pk Exp $
 .\"
 .\" Copyright (c) 1999
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd February 11, 2003
+.Dd April 22, 2005
 .Dt WSKBD 4
 .Os
 .Sh NAME
@@ -46,6 +46,8 @@
 (HIL keyboard)
 .Cd "wskbd* at zkbd? mux 1"
 (Zaurus keyboard)
+.Cd "wskbd* at dnkbd? mux 1"
+(Apollo Domain keyboard)
 .Sh DESCRIPTION
 The
 .Nm
@@ -145,6 +147,7 @@ driver supports it.
 .Sh SEE ALSO
 .Xr akbd 4 ,
 .Xr comkbd 4 ,
+.Xr dnkbd 4 ,
 .Xr gsckbd 4 ,
 .Xr hilkbd 4 ,
 .Xr intro 4 ,
diff --git a/share/man/man4/wsmouse.4 b/share/man/man4/wsmouse.4
index 8e51cf7dbeb..19d2d977fe9 100644
--- a/share/man/man4/wsmouse.4
+++ b/share/man/man4/wsmouse.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wsmouse.4,v 1.9 2003/05/05 13:51:58 jmc Exp $
+.\" $OpenBSD: wsmouse.4,v 1.10 2005/04/22 11:59:10 miod Exp $
 .\" $NetBSD: wsmouse.4,v 1.3 1999/12/06 14:52:08 augustss Exp $
 .\"
 .\" Copyright (c) 1999
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 20, 1999
+.Dd April 22, 2005
 .Dt WSMOUSE 4
 .Os
 .Sh NAME
@@ -48,6 +48,10 @@
 (Apple ADB mouse)
 .Cd "wsmouse*	at hilms? mux 0"
 (HIL mouse)
+.Cd "wsmouse*   at zts? mux 0"
+(Zaurus touchscreen)
+.Cd "wsmouse*   at dnkbd? mux 0"
+(Apollo Domain mouse)
 .Sh DESCRIPTION
 The
 .Nm
@@ -74,6 +78,7 @@ utility gives access to these variables.
 .El
 .Sh SEE ALSO
 .Xr ams 4 ,
+.Xr dnkbd 4 ,
 .Xr hilms 4 ,
 .Xr intro 4 ,
 .Xr lms 4 ,
@@ -82,5 +87,6 @@ utility gives access to these variables.
 .Xr ums 4 ,
 .Xr wscons 4 ,
 .Xr wsmux 4 ,
+.Xr zts 4 ,
 .Xr wsconsctl 8 ,
 .Xr wsmoused 8