Various manpage cleanups after newbus port of ppbus.

Remove alpm.4 from machine independant manpages set.

6 files changed, 19 insertions, 84 deletions

diff --git a/share/man/man4/alpm.4 b/share/man/man4/alpm.4
deleted file mode 100644
index 9a4c85b..0000000
--- a/share/man/man4/alpm.4
+++ /dev/null
@@ -1,58 +0,0 @@
-.\" Copyright (c) 1999 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.
-.\"
-.\"	$FreeBSD$
-.\"
-.\" Note: The date here should be updated whenever a non-trivial
-.\" change is made to the manual page.
-.Dd August 26, 1999
-.Dt ALPM 4 i386
-.\" Note: Only specify the operating system when the command
-.\" is FreeBSD specific, otherwise use the .Os macro with no
-.\" arguments.
-.Os FreeBSD 3.0
-.Sh NAME
-.Nm alpm
-.Nd Aladdin IV/V/Pro2 SMBus controller
-.Sh SYNOPSIS
-.Cd device smbus0
-.Cd device alpm0
-
-.Sh DESCRIPTION
-This driver provides access to 
-.Tn AcerLabs M15x3 Power Management Unit controller. Currently,
-only smbus controller function is implemented.
-
-.Sh SEE ALSO
-.Xr smb 4 ,
-.Xr smbus 4
-.Sh HISTORY
-The
-.Nm
-manual page example first appeared in
-.Fx 3.0 .
-.Sh AUTHORS
-This
-manual page was written by
-.An Nicolas Souchu
diff --git a/share/man/man4/lpbb.4 b/share/man/man4/lpbb.4
index 40d4a49..2d7e54d 100644
--- a/share/man/man4/lpbb.4
+++ b/share/man/man4/lpbb.4
@@ -32,7 +32,7 @@
 .Nd
 Parallel port I2C bit-banging interface
 .Sh SYNOPSIS
-.Cd "device iicbus"
+.Cd "device iicbus0"
 .Cd "device iicbb0"
 .Pp
 .Cd "device lpbb0 at ppbus?"
diff --git a/share/man/man4/man4.i386/alpm.4 b/share/man/man4/man4.i386/alpm.4
index 8e19183..de32157 100644
--- a/share/man/man4/man4.i386/alpm.4
+++ b/share/man/man4/man4.i386/alpm.4
@@ -31,7 +31,7 @@
 .Nm alpm
 .Nd Acer Aladdin 15x3 Power Management controller driver.
 .Sh SYNOPSIS
-.Cd device smbus
+.Cd device smbus0
 .Cd device alpm0
 .Sh DESCRIPTION
 This driver provides access to the
diff --git a/share/man/man4/ppbus.4 b/share/man/man4/ppbus.4
index ebc8b11..4ccf3cb 100644
--- a/share/man/man4/ppbus.4
+++ b/share/man/man4/ppbus.4
@@ -36,7 +36,7 @@ Parallel port bus system
 .Pp
 .Cd "device vpo0 at ppbus?"
 .Pp
-.Cd "device nlpt0 at ppbus?"
+.Cd "device lpt0 at ppbus?"
 .Cd "device plip0 at ppbus?"
 .Cd "device ppi0 at ppbus?"
 .Cd "device pps0 at ppbus?"
@@ -81,7 +81,7 @@ Various drivers have already been ported:
 .Pp
 .Bl -column "Driver" -compact
 .It Em Driver Ta Em Description
-.It Sy nlpt Ta "lpt printer driver"
+.It Sy lpt Ta "lpt printer driver"
 .It Sy plip Ta "lp parallel network interface driver"
 .El
 .Pp
@@ -248,12 +248,6 @@ Finally, the
 .Em device
 layer gathers the parallel peripheral device drivers.
 .Pp
-Each layer has its own C structure respectively ppb_adapter, ppb_data and 
-ppb_device. The ppb_link structure gathers pointers to other structures and
-info shared among different layers.
-.Pp
-See description of these structures in
-.Xr ppbconf 9 .
 .Ss Parallel modes management
 We have to differentiate operating modes at various ppbus system layers.
 Actually, ppbus and adapter operating modes on one hands and for each
@@ -270,12 +264,10 @@ This architecture should support IEEE1284-1994 modes.
 The boot process starts with the probe phasis of the
 .Xr ppc 4
 driver during ISA bus (PC architecture) initialization. During attachment of
-the ppc driver, a new ppbus structure is allocated, initialized
-(linked to the adapter structure) then passed to the function
-.Fn ppb_attachdevs "struct ppb_data *ppb" .
+the ppc driver, a new ppbus structure is allocated, then probe and attachment
+for this new bus node are called.
 .Pp
-.Fn ppb_attachdevs ""
-tries to detect any PnP parallel peripheral (according to
+ppbus attachment tries to detect any PnP parallel peripheral (according to
 .%T "Plug and Play Parallel Port Devices"
 draft from (c)1993-4 Microsoft Corporation)
 then probes and attaches known device drivers.
@@ -288,13 +280,15 @@ ppbus allocation is mandatory not to corrupt I/O of other devices. An other
 usage of ppbus allocation is to reserve the port and receive incoming
 interrupts.
 .Pp
-Interrupts are connected to the
-.Fn ppcintr ""
-function which delivers them to ppbus directly with a
-.Fn ppb_intr "struct ppb_link *pl"
-call. ppbus redirects the
-interrupt to the bus owner's handler if defined. Consequently, if a device
-wants to be delivered an interrupt, it must own the ppbus.
+High level interrupt handlers are connected to the ppbus system thanks to the
+newbus
+.Fn BUS_SETUP_INTR
+and
+.Fn BUS_TEARDOWN_INTR
+functions. But, in order to attach a handler, drivers must
+own the bus. Consequently, a ppbus request is mandatory in order to call the above
+functions (see existing drivers for more info). Note that the interrupt handler
+is automatically released when the ppbus is released.
 .Ss Microsequences
 .Em Microsequences
 is a general purpose mechanism to allow fast low-level
@@ -319,12 +313,11 @@ a modified version of the NIBBLE transfer mode
 various I/O sequences to initialize, select and allocate the peripheral
 .El
 .Sh SEE ALSO
-.Xr nlpt 4 ,
+.Xr lpt 4 ,
 .Xr plip 4 ,
 .Xr ppc 4 ,
 .Xr ppi 4 ,
 .Xr vpo 4 ,
-.Xr ppbconf 9
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/ppi.4 b/share/man/man4/ppi.4
index ca77e5a..4cac96f 100644
--- a/share/man/man4/ppi.4
+++ b/share/man/man4/ppi.4
@@ -33,7 +33,7 @@
 .Nd
 user-space interface to ppbus parallel 'geek' port
 .Sh SYNOPSIS
-.Cd "device ppi0 at ppbus?
+.Cd "device ppi0 at ppbus?"
 .sp
 Minor numbering:  Unit numbers correspond directly to ppbus numbers.
 .Sh DESCRIPTION
diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4
index c91bf53..b453c46 100644
--- a/share/man/man4/vpo.4
+++ b/share/man/man4/vpo.4
@@ -71,7 +71,7 @@ properly at the detected mode (NIBBLE, PS2 or EPP). Tune the
 bootflags to force other modes.
 .Sh SEE ALSO
 .Xr da 4 ,
-.Xr nlpt 4 ,
+.Xr lpt 4 ,
 .Xr ppbus 4 ,
 .Xr ppc 4 ,
 .Xr scsi 4