Kill obio references, and mention zkbd where appropriate.

5 files changed, 22 insertions, 69 deletions

diff --git a/share/man/man4/man4.zaurus/Makefile b/share/man/man4/man4.zaurus/Makefile
index 4d038639b5e..fb226b686cd 100644
--- a/share/man/man4/man4.zaurus/Makefile
+++ b/share/man/man4/man4.zaurus/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.2 2005/01/15 06:37:21 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2005/01/15 17:30:39 miod Exp $
 
 # TODO: aupxa(eventually) cpu
-MAN=	autoconf.4 intro.4 lcd.4 mem.4 obio.4 \
+MAN=	autoconf.4 intro.4 lcd.4 mem.4 \
 	pxagpio.4 pxaintc.4 pxaip.4 pxapcic.4 saost.4 zkbd.4
 
 MLINKS+= mem.4 kmem.4
diff --git a/share/man/man4/man4.zaurus/intro.4 b/share/man/man4/man4.zaurus/intro.4
index ee1e45f9cd7..90fddb27f60 100644
--- a/share/man/man4/man4.zaurus/intro.4
+++ b/share/man/man4/man4.zaurus/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.1 2005/01/04 16:39:13 miod Exp $
+.\"	$OpenBSD: intro.4,v 1.2 2005/01/15 17:30:39 miod Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -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.
 .\"
-.Dd January 4, 2005
+.Dd January 15, 2005
 .Dt INTRO 4 zaurus
 .Os
 .Sh NAME
@@ -92,7 +92,7 @@ A list of the supported devices is given below.
 The devices listed below are supported in this incarnation of
 the system.
 Pseudo-devices are not listed.
-Devices are indicated by their functional interface.
+.\" Devices are indicated by their functional interface.
 Not all supported devices are listed.
 .Pp
 .Bl -tag -width tenletters -compact -offset indent
@@ -109,6 +109,8 @@ USB Communication Device Class Ethernet adapters.
 CATC USB-EL1201A based USB Ethernet adapters.
 .It Xr kue 4
 Kawasaki LSI KL5KUSB101B-based USB Ethernet.
+.It Xr lcd 4
+On-board LCD display.
 .It Xr udav 4
 Davicom DM9601 USB Ethernet adapters.
 .It Xr ukbd 4
@@ -121,6 +123,8 @@ Prolific PL2301/PL2302-based host-to-host USB connectors.
 Realtek RTL8150L USB Ethernet adapters.
 .It Xr wi 4
 WaveLAN/IEEE, PRISM 2-3 and Spectrum24 802.11B wireless network adapters.
+.It Xr zkbd 4
+System keyboard.
 .El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
diff --git a/share/man/man4/man4.zaurus/lcd.4 b/share/man/man4/man4.zaurus/lcd.4
index 075ab34d380..eca09feb598 100644
--- a/share/man/man4/man4.zaurus/lcd.4
+++ b/share/man/man4/man4.zaurus/lcd.4
@@ -1,4 +1,4 @@
-.\" 	$OpenBSD: lcd.4,v 1.1 2005/01/04 16:39:13 miod Exp $
+.\" 	$OpenBSD: lcd.4,v 1.2 2005/01/15 17:30:39 miod Exp $
 .\" 
 .\" Copyright (c) 2005, Miodrag Vallat.
 .\" All rights reserved.
@@ -24,14 +24,14 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 4, 2005
+.Dd January 15, 2005
 .Dt LCD 4 zaurus
 .Os
 .Sh NAME
 .Nm lcd
 .Nd Zaurus LCD Display
 .Sh SYNOPSIS
-.Cd "lcd0       at obio?"
+.Cd "lcd0       at pxaip?"
 .Cd "wsdisplay* at lcd?"
 .Sh DESCRIPTION
 The
@@ -45,7 +45,7 @@ but makes its functions available via the internal
 interface.
 .Sh SEE ALSO
 .Xr autoconf 4 ,
-.Xr obio 4 ,
+.Xr pxaip 4 ,
 .Xr wscons 4 ,
 .Xr wsdisplay 4 ,
 .Xr config 8
diff --git a/share/man/man4/man4.zaurus/obio.4 b/share/man/man4/man4.zaurus/obio.4
deleted file mode 100644
index d7cd7b7a702..00000000000
--- a/share/man/man4/man4.zaurus/obio.4
+++ /dev/null
@@ -1,55 +0,0 @@
-.\" 	$OpenBSD: obio.4,v 1.2 2005/01/04 22:29:22 jmc Exp $
-.\" 
-.\" Copyright (c) 2005, 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 January 4, 2005
-.Dt OBIO 4 zaurus
-.Os
-.Sh NAME
-.Nm obio
-.Nd PXA2x0 On-Board Peripherals
-.Sh SYNOPSIS
-.Cd "obio0    at pxaip? intr 8"
-.Cd "lcd0     at obio?"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides a generic interface to the on-board peripherals found
-on the Intel PXA210, PXA250, PXA260 and PXA270 processors.
-.Pp
-It provides interrupt handler registration and interrupt dispatching
-to its children drivers.
-.Pp
-On the Zaurus, these are:
-.Pp
-.Bl -tag -compact -width tenletters -offset indent
-.It Xr lcd 4
-On-board LCD display.
-.El
-.Sh SEE ALSO
-.Xr autoconf 4 ,
-.Xr lcd 4 ,
-.Xr pxaip 4 ,
-.Xr config 8
diff --git a/share/man/man4/man4.zaurus/pxaip.4 b/share/man/man4/man4.zaurus/pxaip.4
index db59f4a3922..e1af7a6c7ed 100644
--- a/share/man/man4/man4.zaurus/pxaip.4
+++ b/share/man/man4/man4.zaurus/pxaip.4
@@ -1,4 +1,4 @@
-.\" 	$OpenBSD: pxaip.4,v 1.2 2005/01/04 22:19:52 jmc Exp $
+.\" 	$OpenBSD: pxaip.4,v 1.3 2005/01/15 17:30:39 miod Exp $
 .\" 
 .\" Copyright (c) 2005, Miodrag Vallat.
 .\" All rights reserved.
@@ -40,7 +40,8 @@
 .Cd "saost0   at pxaip? addr 0x40a00000 size 0x20"
 .Cd "ohci0    at pxaip? addr 0x4c000000 size 0x70 intr 3"
 .Cd "pxapcic0 at pxaip?"
-.Cd "obio0    at pxaip? intr 8"
+.Cd "lcd0     at pxaip?"
+.Cd "zkbd0    at pxaip?"
 .Sh DESCRIPTION
 The
 .Nm
@@ -52,8 +53,8 @@ Companion drivers provide access to the various resources:
 .Bl -tag -compact -width tenletters -offset indent
 .It Xr com 4
 NS16550-compatible asynchronous serial ports.
-.It Xr obio 4
-On-board peripherals.
+.It Xr lcd 4
+On-board LCD display.
 .It Xr ohci 4
 OHCI USB controller.
 .It Xr pxagpio 4
@@ -64,16 +65,19 @@ INTC interrupt controller.
 PCMCIA controller.
 .It Xr saost 4
 Built-in timer, compatible with the SA-1110 processor timer.
+.It Xr zkbd 4
+System keyboard.
 .El
 .Sh SEE ALSO
 .Xr autoconf 4 ,
 .Xr com 4 ,
-.Xr obio 4 ,
+.Xr lcd 4 ,
 .Xr ohci 4 ,
 .Xr pxagpio 4 ,
 .Xr pxaintc 4 ,
 .Xr pxapcic 4 ,
 .Xr saost 4 ,
+.Xr zkbd 4 ,
 .Xr config 8
 .Sh HISTORY
 Support for the PXA2x0 family appeared in