Create new lpt manpage with ppbus info and the original lpt info.

Fix lp.4 ppbus terminology.

4 files changed, 115 insertions, 82 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 2e73013..39dd5a2 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -4,8 +4,8 @@ MAN4=	bpf.4 bridge.4 ccd.4 cd.4 ch.4 da.4 ddb.4 divert.4 drum.4 \
 	dummynet.4 fd.4 fpa.4 \
 	icmp.4 ifmib.4 iic.4 iicbb.4 iicbus.4 iicsmb.4 \
 	inet.4 intpm.4 intro.4 ip.4 ipfirewall.4 \
-	lkm.4 lo.4 lpbb.4 natm.4 netintro.4 \
-	null.4 od.4 pass.4 plip.4 ppbus.4 ppi.4 ppp.4 pt.4 pty.4 \
+	lkm.4 lo.4 lpbb.4 lpt.4 natm.4 netintro.4 \
+	null.4 od.4 pass.4 ppbus.4 ppi.4 ppp.4 pt.4 pty.4 \
 	route.4 sa.4 scsi.4 \
 	sd.4 sl.4 smb.4 smbus.4 smp.4 snp.4 sppp.4 ssc.4 st.4 su.4 tcp.4 \
 	ttcp.4 termios.4 tty.4 tun.4 udp.4 uk.4 update.4 unix.4 vinum.4 vn.4 \
diff --git a/share/man/man4/lpt.4 b/share/man/man4/lpt.4
new file mode 100644
index 0000000..5b08cbe
--- /dev/null
+++ b/share/man/man4/lpt.4
@@ -0,0 +1,103 @@
+.\"
+.\" Copyright (c) 1993 Christopher G. Demetriou
+.\" Copyright (c) 1994 Geoffrey M. Rehmet
+.\" Copyright (c) 1998 Nicolas Souchu
+.\" 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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 February 14, 1999
+.Dt LPT 4
+.Os FreeBSD
+.Sh NAME
+.Nm lpt
+.Nd
+Generic printer device driver
+.Sh SYNOPSIS
+.Cd "controller ppbus"
+.Cd "device lpt at ppbus?"
+.Pp
+.Cd "controller	ppc0	at isa? port" \&"IO_LPT1\&" tty irq 7
+.Cd "controller	ppc1	at isa? port" \&"IO_LPT2\&" tty irq 7
+.Cd "controller	ppc2	at isa? port" \&"IO_LPT3\&" tty irq 7
+.Pp
+For BIOS-probed ports:
+.Cd "controller ppc0 at isa? port? tty irq 7"
+.Pp
+For polled ports:
+.Cd "controller ppc0 at isa? port? tty"
+.Cd "controller ppc1 at isa? port" \&"IO_LPT2\&" tty
+.Pp
+For DMA capable parallel port:
+.Cd "controller ppc0 at isa? port? tty irq 7 drq 1"
+.Sh DESCRIPTION
+The current
+.Em lpt
+driver is the port of the original lpt driver to the
+.Xr ppbus 4
+system.
+.Pp
+One purpose of this port was to allow parallel port sharing with other
+parallel devices. Secondly, inb()/outb() calls have been replaced by ppbus
+function calls. lpt is now arch-independent thanks to the ppbus interface. See
+.Xr ppbus 4
+for more info about the ppbus system.
+.Pp
+The parallel port bus is allocated by lpt when the printer device is opened
+and released only when the transfer is completed: either when the device
+is closed or when the entire buffer is sent in interrupt driven mode.
+.Pp
+The driver can be configured to be either interrupt-driven, or 
+to poll the printer.  Ports that are configured to be 
+interrupt-driven can be switched to polled mode by using the
+.Xr lptcontrol 8
+command.
+.Pp
+Depending on your hardware, extended capabilities may be configured with the
+.Xr lptcontrol 8
+command (use the -e option). With an ECP/ISA port, you can take advantage
+of FIFO and DMA.
+.Sh SEE ALSO
+.Xr ppbus 4 ,
+.Xr lptcontrol 8
+.Sh HISTORY
+This driver replaces the functionality of the lpa
+driver, which is now defunct.
+.Sh FILES
+.Bl -tag -width Pa -compact
+.It Pa /dev/lpt0
+first parallel port driver
+.El
+.Sh BUGS
+There are lots of them, especially in cheap parallel port implementations.
+.Pp
+It is only possible to open a lpt port when a printer is connected and
+on-line, making it impossible to run 
+.Xr lptcontrol 8 
+when there is no printer connected.
+.Pp
+Please, ensure the
+.Xr ppc 4
+entry in you MACHINE file has the tty interrupt mask.
+.Pp
+This driver could still stand a rewrite.
diff --git a/share/man/man4/man4.i386/lp.4 b/share/man/man4/man4.i386/lp.4
index 620b92a..6f7a1cd 100644
--- a/share/man/man4/man4.i386/lp.4
+++ b/share/man/man4/man4.i386/lp.4
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: lp.4,v 1.7 1998/10/22 14:12:55 bde Exp $
+.\"	$Id: lp.4,v 1.8 1999/02/10 02:45:05 des Exp $
 .\"
 .Dd March 4, 1996
 .Os
@@ -43,7 +43,10 @@
 .Nm ifconfig lp0
 .Ar myaddress hisaddress
 .Op Fl link0
+.Pp
+.Cd "controller ppbus0"
 .Cd "device plip0 at ppbus?"
+.Cd "controller ppc0 at isa? port? net irq 7
 .Sh DESCRIPTION
 The
 .Nm
@@ -54,20 +57,18 @@ input: hence there is no requirement for special bidirectional hardware
 and any standard AT-compatible printer port with working interrupts may be used.
 .Pp
 During the boot process, for each
-.Nm ppc
+.Nm plip
 device which is probed and has an interrupt assigned, a corresponding
-.Nm
-network device is created.  Available devices are announced with a message
-such as:
-.Dl lp0: TCP/IP capable interface
+.Nm network
+device is created.
 .Pp
 Configuring an
-.Nm
+.Nm lp
 device with
 .Xr ifconfig 8
 causes the corresponding
-.Nm ppc
-device to be reserved for PLIP until the network interface is configured 'down'.
+.Nm parallel port bus
+to be reserved for PLIP until the network interface is configured 'down'.
 .Pp
 The communication protocol is selected by the
 .Cm link0
diff --git a/share/man/man4/plip.4 b/share/man/man4/plip.4
deleted file mode 100644
index 63674ad..0000000
--- a/share/man/man4/plip.4
+++ /dev/null
@@ -1,71 +0,0 @@
-.\" Copyright (c) 1998, Nicolas Souchu
-.\" 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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 March 5, 1998
-.Dt PLIP 4
-.Os FreeBSD
-.Sh NAME
-.Nm plip
-.Nd
-Parallel port network interface
-.Sh SYNOPSIS
-.Cd "device plip at ppbus?"
-.Sh DESCRIPTION
-The
-.Em plip
-driver is the port of the
-.Xr lp 4
-driver to the
-.Xr ppbus 4
-system.
-.Pp
-One purpose of this port is to allow parallel port sharing with other
-parallel devices. Parallel port bus allocation has been added to the original
-.Xr lp 4
-driver. Secondly, inb()/outb() calls have been replaced by ppbus function 
-calls. plip is now arch-independent thanks to the ppbus interface. See
-.Xr ppbus 4
-for more info about the ppbus system.
-.Pp
-The ppbus is allocated when the parallel network interface comes up, then
-released when the interface goes down. Consequently, the parallel port bus
-is unavailable to other devices when the network interface is up. plip is
-interrupt driven and needs to own the bus to receive parallel port interrupts.
-.Pp
-Please, ensure the
-.Xr ppc 4
-entry in you MACHINE file has the net interrupt level...
-.Sh SEE ALSO
-.Xr ppbus 4 ,
-.Xr lp 4 ,
-.Sh HISTORY
-The
-.Nm
-manual page first appeared in
-.Fx 3.0 .
-.Sh AUTHOR
-This
-manual page was written by
-.An Nicolas Souchu .