Many updates, including some OpenBSD'ification, device additions and removals,

better cross references (Xr bus types, not each individual driver), formatting
fixes, etc.

diff --git a/share/man/man4/isa.4 b/share/man/man4/isa.4
index 59a0b54..268ebf3 100644 (file)
--- a/share/man/man4/isa.4
+++ b/share/man/man4/isa.4
@@ -1,3 +1,4 @@
+.\"    $OpenBSD: isa.4,v 1.3 2000/04/11 14:01:51 aaron Exp $
 .\"    $NetBSD: isa.4,v 1.19 2000/03/18 16:54:37 augustss Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -35,7 +36,7 @@
 .Os
 .Sh NAME
 .Nm isa
-.Nd ISA bus support and drivers
+.Nd introduction to ISA bus support
 .Sh SYNOPSIS
 .Pp
 .Cd "isa0 at mainbus0"
@@ -47,7 +48,7 @@ bus interface of your system, but the above is typical.
 See
 .Xr intro 4
 for your system for details.
-.Sh INTRODUCTION
+.Sh DESCRIPTION
 The system includes a machine-independent
 .Tn ISA
 bus subsystem and several machine-independent
@@ -74,7 +75,7 @@ or
 devices instead.
 .Pp
 .Sh SUPPORTED DEVICES
-At least the following devices are supporter:
+At least the following devices are supported:
 .Pp
 .Ss SCSI controllers
 .Bl -tag -width speaker -offset ind

diff --git a/share/man/man4/isapnp.4 b/share/man/man4/isapnp.4
index c36856d..7923c37 100644 (file)
--- a/share/man/man4/isapnp.4
+++ b/share/man/man4/isapnp.4
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: isapnp.4,v 1.15 2000/04/03 21:19:36 aaron Exp $
+.\"    $OpenBSD: isapnp.4,v 1.16 2000/04/11 14:01:52 aaron Exp $
 .\"    $NetBSD: isapnp.4,v 1.8 1998/06/07 09:08:46 enami Exp $
 .\"
 .\" Copyright (c) 1997 Jonathan Stone
@@ -58,7 +58,7 @@ Adaptec AHA-1520B SCSI controller card.
 .It aha
 Adaptec AHA-154x SCSI controller card.
 .It wdc
-IDE controllers (typically found on sound cards)
+IDE controllers (typically found on sound cards).
 .El
 .Pp
 .Ss Serial and parallel interfaces
@@ -72,13 +72,13 @@ Win-modems are not supported.
 .Ss Network interfaces
 .Bl -tag -width speaker -offset indent -compact
 .It ep
-3Com 3C509B Etherlink-III Ethernet interface.
+3Com 3c509B EtherLink-III Ethernet interfaces.
 .It le
 Ethernet driver for Lance based Ethernet interfaces.
 .It ne
 NE2000-compatible Ethernet interfaces.
 .It we
-SMC EtherEZ ethernet cards
+SMC EtherEZ ethernet interfaces.
 .El
 .Ss Sound
 .Bl -tag -width speaker -offset indent -compact
@@ -105,7 +105,8 @@ device will be found which the kernel does not recognize.
 The kernel matches
 .Nm
 devices to device drivers based on identifiers which each device
-provides.  For example, this device:
+provides.
+For example, this device:
 .Pp
 joy0 at isapnp0 <Creative SB16 PnP, CTL7001, PNPB02F, Game> port 0x200/8
 .Pp
@@ -113,16 +114,17 @@ This joystick calls itself by the two names
 .Dq CTL7001
 and
 .Dq PNPB02F .
-The latter is a standard name (which the kernel automatically recognises),
+The latter is a standard name (which the kernel automatically recognizes),
 but
 .Dq CTL7001
-is a vendor-specific name which needs to be added to a table.  Unfortunately,
+is a vendor-specific name which needs to be added to a table.
+Unfortunately,
 some devices advertise only their vendor-specific name; for instance:
 .Pp
 isapnp0: <PnP Sound Chip, @P@1001, , > port 0x200/8 not configured
 .Pp
-Testing will show that this device is actually a joystick.  To resolve
-the issue, the actual name
+Testing will show that this device is actually a joystick.
+To resolve the issue, the actual name
 .Dq @P@1001
 has to be entered into the database found in
 .Pa /sys/dev/isa/pnpdevs
@@ -130,19 +132,12 @@ and a new kernel must be built.
 Then the device will probe like this:
 .Pp
 joy0 at isapnp0 <PnP Sound Chip, @P@1001, , > port 0x200/8
-.Pp
 .Sh SEE ALSO
-.Xr aha 4 ,
-.Xr aic 4 ,
-.Xr ep 4 ,
+.Xr cardbus 4 ,
 .Xr intro 4 ,
-.Xr joy 4 ,
-.Xr le 4 ,
-.Xr ne 4 ,
-.Xr pccom 4 ,
-.Xr sb 4 ,
-.Xr wss 4 ,
-.Xr ym 4
+.Xr isa 4 ,
+.Xr pci 4 ,
+.Xr usb 4
 .Sh HISTORY
 The
 .Nm

diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 97c2df2..60cdd14 100644 (file)
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -1,3 +1,4 @@
+.\"    $OpenBSD: pci.4,v 1.3 2000/04/11 14:01:52 aaron Exp $
 .\"    $NetBSD: pci.4,v 1.29 2000/04/01 00:32:23 tsarna Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -35,7 +36,7 @@
 .Os
 .Sh NAME
 .Nm pci
-.Nd PCI bus support and drivers
+.Nd introduction to PCI bus support
 .Sh SYNOPSIS
 .Pp
 .Cd "pci* at mainbus? bus ?"
@@ -50,7 +51,7 @@ bus interface of your system.
 See
 .Xr intro 4
 for your system for details.
-.Sh INTRODUCTION
+.Sh DESCRIPTION
 The system includes a machine-independent
 .Tn PCI
 bus subsystem and
@@ -79,6 +80,10 @@ drivers, sorted by device type and driver name:
 .Pp
 .Ss SCSI interfaces
 .Bl -tag -width speaker -offset ind
+.It Xr adw 4 , Xr adv 4
+AdvanSys PCI
+.Tn SCSI
+interfaces.
 .It Xr ahc 4
 Adaptec 29xx, 39xx, and other AIC-7xxx-based
 .Tn SCSI
@@ -89,6 +94,10 @@ Buslogic BT-9xx
 interfaces.
 .It Xr dpt 4
 DPT SmartCache/SmartRAID III and IV SCSI interfaces.
+.It Xr gdt 4
+ICP-Vortex GDT
+.Tn Raid
+interface.
 .It Xr isp 4
 QLogic ISP-1020, ISP-1040, and ISP-2100
 .Tn SCSI
@@ -99,122 +108,79 @@ interfaces.
 Symbios Logic/NCR 53c8xx-family
 .Tn SCSI
 interfaces.
-.It Xr adw 4 , Xr adv 4
-AdvanSys PCI
-.Tn SCSI
-interfaces.
-.It Xr gdt 4
-ICP-Vortex GDT
-.Tn Raid
-interface.
 .El
 .Pp
 .Ss Network interfaces
 .Bl -tag -width speaker -offset ind
+.It Xr dc 4
+Various Tulip-like Ethernet
+interfaces such as the DEC/Intel 21143;
+Macronix 98713, 98713A, 98715, 98715A and 98725;
+Davicom DM9100 and DM9102;
+ASIX Electronics AX88140A and AX88141
+ADMtek AL981 Comet and AN985 Centaur;
+Lite-On 82c168 and 82c169 PNIC;
+and
+Lite-On/Macronix 82c115 PNIC II.
 .It Xr de 4
 .Tn DEC
-DC21x4x (Tulip) based
-.Tn Ethernet
+DC21x4x (Tulip) based Ethernet
 interfaces, including the DE435, DE450, DE500;
 Znyx ZX3xx;
 SMC 8432, 9332, 9334;
 Cogent/Adaptec EM100FX and EM440TX;
 and Asante single- and multi-port
-.Tn Ethernet
-interfaces.  Multi-port interfaces are typically
-configured as a
+Ethernet interfaces.
+Multi-port interfaces are typically configured as
 .Tn PCI Ns \- Ns Tn PCI
-bridge with multiple
-.Em de
+bridges with multiple
+.Xr de 4
 instances on the
 .Tn PCI
 bus on the other side of the bridge.
 .It Xr en 4
-Midway-based Efficent Networks Inc. and Adaptec ATM interfaces.
+Midway-based Efficient Networks Inc. and Adaptec ATM interfaces.
 .It Xr ep 4
-3Com 3c590, 3c595
-.Tn Ethernet
-interfaces.
-.It Xr xl 4
-3Com 3c900, 3c905, 3c980, and 3cSOHO
-.Tn Ethernet
-interfaces.
+3Com 3c590 and 3c595 Ethernet interfaces.
 .It Xr fpa 4
 .Tn DEC
 DEFPA
 .Tn FDDI
 interfaces.
 .It Xr fxp 4
-Intel EtherExpress PRO 10+/100B
-.Tn Ethernet
-interfaces.
+Intel EtherExpress PRO 10+/100B Ethernet interfaces.
 .It Xr le 4
-PCNet-PCI
-.Tn Ethernet
-interfaces.
-.It Xr ne 4
-NE2000-compatible
-.Tn Ethernet
-interfaces.
-.It Xr tl 4
-Texas Instruments ThunderLAN-based
-.Tn Ethernet
-interfaces.
-.It Xr dc 4
-Various Tulip-like
-.Tn Ethernet
-interfaces such as the DEC/Intel 21143;
-Macronix 98713, 98713A, 98715, 98715A and 98725;
-Davicom DM9100 and DM9102;
-ASIX Electronics AX88140A and AX88141
-ADMtek AL981 Comet and AN985 Centaur;
-Lite-On 82c168 and 82c169 PNIC;
-and
-Lite-On/Macronix 82c115 PNIC II.
+PCNet-PCI Ethernet interfaces.
 .It Xr lmc 4
- Lan Media Corporation
+Lan Media Corporation
 .Tn SSI/DS1/HSSI/DS3
 interfaces.
+.It Xr ne 4
+NE2000-compatible Ethernet interfaces.
 .It Xr rl 4
-RealTek 8129/8139
-.Tn Ethernet
-interfaces.
+RealTek 8129/8139 Ethernet interfaces.
 .It Xr sf 4
-Adaptec AIC-6915 "Starfire"
-.Tn Ethernet
-interfaces.
+Adaptec AIC-6915 "Starfire" Ethernet interfaces.
 .It Xr sis 4
-Silicon Integrated Systems
-.Tn Ethernet
-interfaces.
+Silicon Integrated Systems Ethernet interfaces.
 .It Xr sk 4
-SysKonnect SK-984x
-.Tn Gigabit Ethernet
-interfaces.
+SysKonnect SK-984x Gigabit Ethernet interfaces.
 .It Xr ste 4
-Sundance Technologies ST201
-.Tn Ethernet
-interfaces.
+Sundance Technologies ST201 Ethernet interfaces.
 .It Xr ti 4
-Alteon Networks Tigon I and Tigon II
-.Tn Gigabit Ethernet
-interfaces.
+Alteon Networks Tigon I and Tigon II Gigabit Ethernet interfaces.
+.It Xr tl 4
+Texas Instruments ThunderLAN-based Ethernet interfaces.
 .It Xr tx 4
-SMC 9432 10/100 Mbps
-.Tn Ethernet
-interfaces.
+SMC 9432 10/100 Mbps Ethernet interfaces.
 .It Xr vr 4
-VIA Technologies VT3043 and VT86C100A
-.Tn Ethernet
-interfaces.
+VIA Technologies VT3043 and VT86C100A Ethernet interfaces.
 .It Xr wb 4
-Winbond W89C840F
-.Tn Ethernet
-interfaces.
+Winbond W89C840F Ethernet interfaces.
 .It Xr wx 4
-Intel
-.Tn Gigabit Ethernet
-interfaces.
+Intel Gigabit Ethernet interfaces.
+.It Xr xl 4
+3Com 3c900, 3c905, 3c980, and 3cSOHO Ethernet interfaces.
 .El
 .Pp
 .Ss Serial interfaces
@@ -226,27 +192,28 @@ device interface.
 .Pp
 .Ss Audio devices
 .Bl -tag -width speaker -offset ind
-.It Xr auvia 4
-VIA VT82C686A integrated AC'97 sound device.
-.It Xr clcs 4
-Cirrus Logic CS4280 sound device.
 .It Xr eap 4
 Ensoniq AudioPCI sound device.
 .It Xr eso 4
 ESS Solo-1 PCI AudioDrive sound device.
-.It Xr fms 4
-Forte Media FM801 sound device.
 .It Xr sv 4
 S3 SonicVibes sound device.
 .El
 .Pp
 .Ss Miscellaneous devices
 .Bl -tag -width speaker -offset ind
+.It Xr bktr 4
+Brooktree Bt848
+.Tn PCI
+video capture boards.
 .It Xr cbb 4
 .Tn PCI
 Yenta compatible
 .Tn CardBus
 bridges.
+.It Xr hifn 4
+Hi/fn 7751
+.Tn Symmetric Encryption Accelerator.
 .It Xr ohci 4
 USB OHCI host controller.
 .It Xr pcic 4
@@ -269,39 +236,15 @@ and
 communications ports.
 .It Xr uhci 4
 USB UHCI host controller.
-.It Xr hifn 4
- Hi/fn 7751
-.Tn Symmetric Encryption Accelerator.
+.It Xr wdt 4
+ICS PCI-WDT500/501 watchdog timer devices.
 .El
 .Pp
 .Sh SEE ALSO
+.Xr cardbus 4 ,
 .Xr intro 4 ,
-.Xr ahc 4 ,
-.Xr auvia 4 ,
-.Xr bha 4 ,
-.Xr cac 4 ,
-.Xr clcs 4 ,
-.Xr cy 4 ,
-.Xr de 4 ,
-.Xr dpt 4 ,
-.Xr eap 4 ,
-.Xr eso 4 ,
-.Xr en 4 ,
-.Xr ep 4 ,
-.Xr eso 4 ,
-.Xr ex 4 ,
-.Xr fms 4 ,
-.Xr fpa 4 ,
-.Xr fxp 4 ,
-.Xr isp 4 ,
-.Xr le 4 ,
-.Xr ncr 4 ,
-.Xr ne 4 ,
-.Xr pcic 4 ,
-.Xr ppb 4 ,
-.Xr puc 4 ,
-.Xr sv 4 ,
-.Xr tl 4 ,
+.Xr isa 4 ,
+.Xr isapnp 4 ,
 .Xr usb 4
 .Sh HISTORY
 The machine-independent

diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 8f94da1..51aa9e8 100644 (file)
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: usb.4,v 1.4 2000/04/03 21:19:37 aaron Exp $
+.\"    $OpenBSD: usb.4,v 1.5 2000/04/11 14:01:52 aaron Exp $
 .\"    $NetBSD: usb.4,v 1.15 1999/07/29 14:20:32 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 .Os
 .Sh NAME
 .Nm usb
-.Nd Universal Serial Bus driver
+.Nd introduction to Universal Serial Bus support
 .Sh SYNOPSIS
 .Cd "uhci*   at pci? function ?"
 .Cd "ohci*   at pci? function ?"
@@ -52,7 +52,7 @@
 .Pp
 .Cd "#include <dev/usb/usb.h>"
 .Cd "#include <dev/usb/usbhid.h>"
-.Sh INTRODUCTION
+.Sh DESCRIPTION
 .Ox
 provides machine-independent bus support and drivers for Universal Serial Bus
 .Pq Tn USB
@@ -94,15 +94,31 @@ system.
 includes machine-independent
 .Tn USB
 drivers, sorted by driver name:
-.Bl -tag -width speaker -offset indent
+.Pp
+.Bl -tag -width speaker -offset indent -compact
+.It if_aue
+AN986 Pegasus-based Ethernet interfaces.
+.It if_cue
+CATC USB-EL1201A-based Ethernet interfaces.
+.It if_kue
+Kawasaki LSI KL5KUSB101B-based Ethernet interfaces.
 .It uaudio
-driver for audio devices.
+Audio devices.
 .It ugen
-generic driver for
+Generic driver for unknown
 .Tn USB
 devices.
 .It uhid
-generic driver for Human Interface Devices.
+Generic driver for Human Interface Devices.
+.It ulpt
+.Tn USB
+Printers.
+.It umass
+.Tn USB
+Mass Storage Devices, i.e., external disk drives.
+.It umodem
+.Tn USB
+Modems.
 .El
 .Sh INTRODUCTION TO USB
 The
@@ -146,7 +162,8 @@ and interfaces.
 Each device located on a hub has several
 .Xr config 8
 locators:
-.Bl -tag -compact -width xxxxxxx
+.Pp
+.Bl -tag -width configuration -compact
 .It Cd port
 Number of the port on closest upstream hub.
 .It Cd configuration
@@ -319,19 +336,12 @@ The include file
 similarly contains the definitions for
 Human Interface Devices
 .Pq Tn HID .
-.Sh BUGS
-There should be a serial number locator, but
-.Ox
-does not have string valued locators.
 .Sh SEE ALSO
-.\".Xr usb 3 ,
+.Xr cardbus 4 ,
+.Xr intro 4 ,
+.Xr isa 4 ,
+.Xr isapnp 4 ,
 .Xr pci 4 ,
-.Xr uaudio 4 ,
-.Xr ugen 4 ,
-.Xr uhid 4 ,
-.\".Xr ukbd 4 ,
-.\".Xr ulpt 4 ,
-.\".Xr ums 4 ,
 .Xr usbdevs 8
 .Pp
 The
@@ -346,3 +356,7 @@ The
 driver
 appeared in
 .Ox 2.6 .
+.Sh BUGS
+There should be a serial number locator, but
+.Ox
+does not have string valued locators.