Remove imm.4, merged with vpo.4

Fix vpo.4 manpage generation in Makefile
Fix bootflags bits description in ppc.4

6 files changed, 75 insertions, 70 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 28ffe9e..85ac84b 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -3,7 +3,7 @@
 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 \
-	imm.4 inet.4 intro.4 ip.4 ipfirewall.4 \
+	inet.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 \
 	route.4 sa.4 scsi.4 \
@@ -18,6 +18,7 @@ MLINKS+=fpa.4 fea.4
 MLINKS+=yp.4 YP.4 yp.4 nis.4 yp.4 NIS.4
 MLINKS+=smp.4 SMP.4
 MLINKS+=scsi.4 cam.4
+MLINKS+=vpo.4 imm.4
 
 # XXX NOT IMPORTED:	man4.hp300 man4.sparc man4.tahoe man4.vax
 SUBDIR=	 man4.i386 
diff --git a/share/man/man4/imm.4 b/share/man/man4/imm.4
deleted file mode 100644
index cbc3070..0000000
--- a/share/man/man4/imm.4
+++ /dev/null
@@ -1,59 +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 October 27, 1998
-.Dt IMM 4
-.Os FreeBSD
-.Sh NAME
-.Nm imm
-.Nd
-Parallel to SCSI interface driver
-.Sh SYNOPSIS
-.Cd "controller vpo at ppbus?"
-.Pp
-For one or more SCSI busses:
-.Cd "controller scbus0 at vpo0"
-.Sh DESCRIPTION
-The imm driver is an extension of the
-.Xr vpo 4
-driver for the Iomega Matchmaker Parallel to SCSI interface. This driver
-is mostly written with the
-.Xr microseq 9
-mechanism.
-.Sh SEE ALSO
-.Xr ppbus 4 ,
-.Xr vpo 4 ,
-.Xr microseq 9 ,
-.Xr scsi 4 ,
-.Xr sd 4
-.Sh HISTORY
-The
-.Nm
-manual page first appeared in
-.Fx 3.0 .
-.Sh AUTHOR
-This
-manual page was written by
-.An Nicolas Souchu .
diff --git a/share/man/man4/man4.i386/ppc.4 b/share/man/man4/man4.i386/ppc.4
index 91cb2d3..ee165ae 100644
--- a/share/man/man4/man4.i386/ppc.4
+++ b/share/man/man4/man4.i386/ppc.4
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998, Nicolas Souchu
+.\" Copyright (c) 1998, 1999, Nicolas Souchu
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@ calls ppbus attach function.
 .Ss Supported flags
 .Bl -item -offset indent
 .It
-bits 0-4: chipset forced mode(s)
+bits 0-3: chipset forced mode(s)
 .Bd -literal
 PPB_COMPATIBLE  0x0     /* Centronics compatible mode */
 PPB_NIBBLE      0x1     /* reverse 4 bit mode */
@@ -64,9 +64,11 @@ PPB_ECP         0x8     /* ECP mode */
 .Pp
 And any mixed values.
 .It
-bit 5: EPP protocol (0 EPP 1.9, 1 EPP 1.7)
+bit 4: EPP protocol (0 EPP 1.9, 1 EPP 1.7)
 .It
-bit 6: activate IRQ (1 IRQ disabled, 0 IRQ enabled)
+bit 5: activate IRQ (1 IRQ disabled, 0 IRQ enabled)
+.It
+bit 6: disable chipset specific detection
 .El
 .Ss Supported chipsets
 Some parallel port chipsets are explicitly supported by ppc: detection and
@@ -101,6 +103,9 @@ mode is forced to the given mode and no other mode is available and
 ppb->ppb_avm field contains the available modes of the chipset
 .Sh SEE ALSO
 .Xr ppbus 4
+.Sh BUGS
+The chipset detection process may corrupt your chipset configuration. You may
+disable chipset specific detection by using the above flags.
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/ppbus.4 b/share/man/man4/ppbus.4
index 74a06bd..3b012f4 100644
--- a/share/man/man4/ppbus.4
+++ b/share/man/man4/ppbus.4
@@ -155,6 +155,26 @@ DMA as well as programmed I/O for the host register interface.
 The EPP protocol was originally developed as a means to provide a high
 performance parallel port link that would still be compatible with the
 standard parallel port.
+.Pp
+The EPP mode has two types of cycle: address and data. What makes the 
+difference at hardware level is the strobe of the byte placed on the data
+lines. Data are strobed with nAutofeed, addresses are strobed with 
+nSelectin signals.
+.Pp
+A particularity of the ISA implementation of the EPP protocol is that an 
+EPP cycle fits in an ISA cycle. In this fashion, parallel port peripherals can
+operate at close to the same performance levels as an equivalent ISA plug-in
+card.
+.Pp
+At software level, you may implement the protocol you wish, using data and
+address cycles as you want. This is for the IEEE1284 compatible part. Then,
+peripheral vendors may implement protocol handshake with the following 
+status lines: PError, nFault and Select. Try to know how these lines toggle
+with your peripheral, allowing the peripheral to request more data, stop the
+transfer and so on.
+.Pp
+At any time, the peripheral may interrupt the host with the nAck signal without
+disturbing the current transfer.
 .Ss Mixed modes
 Some manufacturers, like SMC, have implemented chipsets that support mixed
 modes. With such chipsets, mode switching is available at any time by
diff --git a/share/man/man4/ppc.4 b/share/man/man4/ppc.4
index 91cb2d3..ee165ae 100644
--- a/share/man/man4/ppc.4
+++ b/share/man/man4/ppc.4
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998, Nicolas Souchu
+.\" Copyright (c) 1998, 1999, Nicolas Souchu
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@ calls ppbus attach function.
 .Ss Supported flags
 .Bl -item -offset indent
 .It
-bits 0-4: chipset forced mode(s)
+bits 0-3: chipset forced mode(s)
 .Bd -literal
 PPB_COMPATIBLE  0x0     /* Centronics compatible mode */
 PPB_NIBBLE      0x1     /* reverse 4 bit mode */
@@ -64,9 +64,11 @@ PPB_ECP         0x8     /* ECP mode */
 .Pp
 And any mixed values.
 .It
-bit 5: EPP protocol (0 EPP 1.9, 1 EPP 1.7)
+bit 4: EPP protocol (0 EPP 1.9, 1 EPP 1.7)
 .It
-bit 6: activate IRQ (1 IRQ disabled, 0 IRQ enabled)
+bit 5: activate IRQ (1 IRQ disabled, 0 IRQ enabled)
+.It
+bit 6: disable chipset specific detection
 .El
 .Ss Supported chipsets
 Some parallel port chipsets are explicitly supported by ppc: detection and
@@ -101,6 +103,9 @@ mode is forced to the given mode and no other mode is available and
 ppb->ppb_avm field contains the available modes of the chipset
 .Sh SEE ALSO
 .Xr ppbus 4
+.Sh BUGS
+The chipset detection process may corrupt your chipset configuration. You may
+disable chipset specific detection by using the above flags.
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4
index 28f8ed4..ce7d3f8 100644
--- a/share/man/man4/vpo.4
+++ b/share/man/man4/vpo.4
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998, Nicolas Souchu
+.\" Copyright (c) 1998, 1999, Nicolas Souchu
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -41,10 +41,43 @@ The primary purpose of the
 driver is to provide access to the Adaptec AIC-7110 SCSI controller built
 in the Iomega ZIP drive. But it should also work with the Iomega Jaz Traveller
 parallel to SCSI interface.
+.Pp
+The driver has been extended to the ZIP+ drive which is based on the
+Iomega Matchmaker Parallel to SCSI interface.
+.Sh USAGE
+The driver should let you use a printer connected to the drive while
+transfering data.
+.Pp
+DOS and FreeBSD filesystems are supported. When mounting a DOS filesystem or
+formating a FreeBSD filesystem, check the slice of the disk with the
+.Xr fdisk 8
+utility.
+.Pp
+In order to unixify a ZIP disk, put the following in /etc/disktab:
+
+zip|zip 100:\\
+        :ty=removable:se#512:nc#96:nt#64:ns#32:\\
+        :pa#196608:oa#0:ba#4096:fa#512:\\
+        :pb#196608:ob#0:bb#4096:fb#512:\\
+        :pc#196608:oc#0:bc#4096:fc#512:
+
+and use
+.Xr disklabel 8 .
+.Pp
+If you have trouble with your driver, your parallel chipset may not run
+properly at the detected mode (NIBBLE, PS2 or EPP). Tune the
+.Xr ppc 4
+bootflags to force other modes.
 .Sh SEE ALSO
+.Xr ppc 4 ,
 .Xr ppbus 4 ,
+.Xr nlpt 4 ,
 .Xr scsi 4 ,
-.Xr sd 4
+.Xr da 4
+.Sh BUGS
+During boot, the driver firstly try to detect a classic ZIP, then a ZIP+.
+The ZIP+ detection is intrusive and may send errorneous charaters to your
+printer if the drive is not connected to your parallel port.
 .Sh HISTORY
 The
 .Nm