Move the i386 version of lpt.4 to the common directory since lpt is

used on 4 platforms now...

7 files changed, 10 insertions, 150 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 6dffda28f6b..53d192c0a2f 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.193 2002/02/23 18:30:12 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.194 2002/03/14 19:39:16 jason Exp $
 
 MAN=	aac.4 ac97.4 addcom.4 adv.4 aha.4 ahb.4 ahc.4 aic.4 ami.4 amphy.4 \
 	an.4 aria.4 ast.4 atalk.4 atapiscsi.4 \
@@ -14,7 +14,7 @@ MAN=	aac.4 ac97.4 addcom.4 adv.4 aha.4 ahb.4 ahc.4 aic.4 ami.4 amphy.4 \
 	inet.4 inphy.4 iop.4 iopsp.4 ioprbs.4 iophy.4 ip.4 ipcomp.4 ipsec.4 \
 	isa.4 isapnp.4 ises.4 iso.4 isp.4 \
 	ksyms.4 kue.4 \
-	lc.4 lge.4 lkm.4 lmc.4 lo.4 lofn.4 lxtphy.4 \
+	lc.4 lge.4 lkm.4 lmc.4 lo.4 lofn.4 lpt.4 lxtphy.4 \
 	maestro.4 midi.4 mii.4 mtdphy.4 mr.4 mtio.4 \
 	ncr.4 ne.4 neo.4 netintro.4 nge.4 ns.4 nsip.4 nsphy.4 \
 	nsphyter.4 null.4 \
diff --git a/share/man/man4/man4.i386/lpt.4 b/share/man/man4/lpt.4
index 1826cb3aa6c..a1ade081504 100644
--- a/share/man/man4/man4.i386/lpt.4
+++ b/share/man/man4/lpt.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lpt.4,v 1.8 2001/08/03 14:30:26 mpech Exp $
+.\"	$OpenBSD: lpt.4,v 1.1 2002/03/14 19:39:16 jason Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
@@ -29,13 +29,12 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd August 6, 1993
-.Dt LPT 4 i386
+.Dt LPT 4
 .Os
 .Sh NAME
 .Nm lpt
 .Nd parallel port driver
 .Sh SYNOPSIS
-.\" XXX this is awful hackery to get it to work right... -- cgd
 .Cd "lpt0 at isa? port" \&"IO_LPT1\&" irq 7
 .Cd "lpt1 at isa? port" \&"IO_LPT2\&"
 .Sh DESCRIPTION
diff --git a/share/man/man4/man4.alpha/Makefile b/share/man/man4/man4.alpha/Makefile
index e49789000f6..7266a7fd0c2 100644
--- a/share/man/man4/man4.alpha/Makefile
+++ b/share/man/man4/man4.alpha/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.11 2001/10/06 22:33:39 nate Exp $
+#	$OpenBSD: Makefile,v 1.12 2002/03/14 19:39:16 jason Exp $
 
-MAN=	com.4 esp.4 intro.4 le.4 lpt.4 mem.4 pms.4 scc.4 tga.4 wd.4
+MAN=	com.4 esp.4 intro.4 le.4 mem.4 pms.4 scc.4 tga.4 wd.4
 MLINKS=	mem.4 kmem.4
 MANSUBDIR=alpha
 
diff --git a/share/man/man4/man4.alpha/lpt.4 b/share/man/man4/man4.alpha/lpt.4
deleted file mode 100644
index 12e49b761bf..00000000000
--- a/share/man/man4/man4.alpha/lpt.4
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"	$OpenBSD: lpt.4,v 1.5 2001/10/05 14:45:53 mpech Exp $
-.\"
-.\" Copyright (c) 1993 Christopher G. Demetriou
-.\" 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 Christopher G. Demetriou.
-.\" 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 August 6, 1993
-.Dt LPT 4 alpha
-.Os
-.Sh NAME
-.Nm lpt
-.Nd Parallel port driver
-.Sh SYNOPSIS
-.\" XXX this is awful hackery to get it to work right... -- cgd
-.Cd "lpt0 at isa? port" \&"IO_LPT1\&" irq 7
-.Cd "lpt1 at isa? port" \&"IO_LPT2\&"
-.Sh DESCRIPTION
-This driver provides access to parallel ports.
-.Pp
-The highest bit in the minor (bit 7, or add 128) number selects
-whether to do polling or wait for interrupts.
-If no IRQ is specified in the kernel configuration, only the polling device 
-may be used.
-.Pp
-The next lower bit (bit 6, or add 64) indicates the driver should
-avoid initializing the printer.
-.P.
-The next lower bit (bit 5, or add 32) requests that the driver do
-automatic LF generation when printing CRs.
-.Sh FILES
-.Bl -tag -width Pa -compact
-.It Pa /dev/lpt0
-first interrupt-driven parallel port device
-.It Pa /dev/lpa0
-first polled parallel port device
-.El
diff --git a/share/man/man4/man4.hppa/Makefile b/share/man/man4/man4.hppa/Makefile
index 6e3257679b5..50dd787633f 100644
--- a/share/man/man4/man4.hppa/Makefile
+++ b/share/man/man4/man4.hppa/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.2 2001/06/20 16:27:28 mpech Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/03/14 19:39:16 jason Exp $
 
-MAN=	lasi.4 asp.4 gsc.4 lpt.4 # com.4 # eba.4 hil.4
+MAN=	lasi.4 asp.4 gsc.4 # com.4 # eba.4 hil.4
 # aone.4 atwo.4 wax.4 dino.4 tir.4 xbar.4 mcx.4
 MANSUBDIR=hppa
 
diff --git a/share/man/man4/man4.hppa/lpt.4 b/share/man/man4/man4.hppa/lpt.4
deleted file mode 100644
index 36870a1cd10..00000000000
--- a/share/man/man4/man4.hppa/lpt.4
+++ /dev/null
@@ -1,78 +0,0 @@
-.\"	$OpenBSD: lpt.4,v 1.5 2001/08/03 15:21:16 mpech Exp $
-.\"
-.\"
-.\" Copyright (c) 1999 Michael Shalayeff
-.\" 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 Michael Shalayeff.
-.\" 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.
-.\"
-.Dd April 14, 1999
-.Dt LPT 4
-.Os
-.Sh NAME
-.Nm lpt
-.Nd Printer port controller
-.Sh SYNOPSIS
-.Cd "lpt0 at gsc? irq 7"
-.Pp
-.Cd "lpt0 at isa? port" \&"IO_LPT1\&" irq 7
-.Sh INTRODUCTION
-Parallel port controller provides Centronics port for unidirectional
-data communications
-.Tn ( IEEE 1284 ) .
-.Pp
-The
-.Nm
-ports on
-.Xr isa 4
-comes in whole rainbow of flaivours.
-The parallel port controller on
-.Xr gsc 4
-(core) bus comes in several chip implementations:
-.Pp
-.Bl -tag -compact -width WD16C552
-.It WD16C552
-contains both serial ports and a parallel port;
-.It LASI
-incorporated into the
-.Xr lasi 4
-megacell hyperchip.
-.El
-.Pp
-In either case the bus interface is the same and compatible with
-PC parallel ports.
-.Sh SEE ALSO
-.Xr com 4 ,
-.Xr gsc 4 ,
-.Xr isa 4 ,
-.Xr lasi 4
-.Sh HISTORY
-The
-.Nm
-driver was originally developed by William F. Jolitz, TeleMuse.
-The implementation for hppa port is using MI implementation of this
-driver and first appeared in
-.Ox 2.4 .
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index 2e2a5a16834..332b1f9426e 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.43 2002/02/23 18:30:13 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.44 2002/03/14 19:39:16 jason Exp $
 #	from: @(#)Makefile	5.1 (Berkeley) 2/12/91
 #	Id: Makefile,v 1.4 1995/12/14 05:41:38 deraadt Exp $
 
 MAN=	apm.4 autoconf.4 bios.4 bktr.4 gus.4 ie.4 intro.4 iy.4 joy.4 \
-	le.4 lms.4 lpt.4 mcd.4 mem.4 mms.4 mtrr.4 npx.4 pcibios.4 \
+	le.4 lms.4 mcd.4 mem.4 mms.4 mtrr.4 npx.4 pcibios.4 \
 	pctr.4 pss.4 sb.4 \
 	sea.4 speaker.4 uha.4 wdt.4 wss.4 wt.4