Update man pages in the section 4 to match the reality in -CURRENT.

- Change lines referring to kernel configuration file:
        device foo0 at isa port xxx irq yyy...
  to
        device foo
  Describe resource "hints" in /boot/device.hints.

- Try to describe resource allocation and probe/attach behavior in the
  newbus framework.

18 files changed, 215 insertions, 73 deletions

diff --git a/share/man/man4/man4.i386/aic.4 b/share/man/man4/man4.i386/aic.4
index c48d005..f36edd1 100644
--- a/share/man/man4/man4.i386/aic.4
+++ b/share/man/man4/man4.i386/aic.4
@@ -30,7 +30,11 @@
 .Nm aic
 .Nd Adaptec AIC-6260 and AIC-6360 SCSI driver
 .Sh SYNOPSIS
-.Cd "device aic0 at isa? port 0x340 irq 11"
+.Cd "device aic"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.aic.0.at="isa"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/asc.4 b/share/man/man4/man4.i386/asc.4
index 2c8c66d..3ff0e21 100644
--- a/share/man/man4/man4.i386/asc.4
+++ b/share/man/man4/man4.i386/asc.4
@@ -37,7 +37,14 @@
 .Nm asc
 .Nd device driver for a GI1904-based hand scanner
 .Sh SYNOPSIS
-.Cd "device asc0 at isa? port IO_ASC1 drq 3 irq 10"
+.Cd "device asc 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.asc.0.at="isa"
+.Cd hint.asc.0.port="0x3EB"
+.Cd hint.asc.0.drq="3"
+.Cd hint.asc.0.irq="10"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/cs.4 b/share/man/man4/man4.i386/cs.4
index 95657c2..60c219e 100644
--- a/share/man/man4/man4.i386/cs.4
+++ b/share/man/man4/man4.i386/cs.4
@@ -32,8 +32,14 @@
 .Nm cs
 .Nd ethernet device driver
 .Sh SYNOPSIS
-.Cd "device cs0 at isa? port 0x300 irq ?"
-.Cd "device cs1 at isa? port 0x300 irq 10 iomem 0xd0000"
+.Cd "device cs"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.cs.0.at="isa"
+.Cd hint.cs.0.port="0x300"
+.Cd hint.cs.0.irq="10"
+.Cd hint.cs.0.maddr="0xd000"
 .Sh DESCRIPTION
 The
 .Nm
@@ -48,9 +54,14 @@ size and low cost of the CS89x0 family compensate for their drawbacks.
 .Pp
 The
 .Nm
-driver will obtain configuration parameters either from the configuration entry
-or from the card.  Parameters specified in the configuration entry will be
-used if present; the card may be soft-configured so these may be any valid
+driver will obtain configuration parameters either from
+.Pa /boot/device.hints
+or from the card.
+At least the I/O port number must be specified.
+Other parameters specified in
+.Pa /boot/device.hints
+will be used if present;
+the card may be soft-configured so these may be any valid
 value.  Adapters based on the CS8920 normally offer PnP configuration and the driver
 will detect the
 .Tn IBM EtherJet
diff --git a/share/man/man4/man4.i386/cx.4 b/share/man/man4/man4.i386/cx.4
index ea4def5..55f185e 100644
--- a/share/man/man4/man4.i386/cx.4
+++ b/share/man/man4/man4.i386/cx.4
@@ -8,11 +8,19 @@
 .Nm cx
 .Nd asynchronous/synchronous Cronyx-Sigma adapter driver
 .Sh SYNOPSIS
-.Cd "device cx0 at isa? port 0x240 irq 15 drq 7"
-.Cd "device cx1 at isa? port 0x260 irq 12 drq 6"
+.Cd "device cx 1"
 .Cd device sppp
 .Pp
-The base i/o port address should be set by jumpers on the board.
+In
+.Pa /boot/device.hints :
+.Cd hint.cx.0.at="isa"
+.Cd hint.cx.0.port="0x240"
+.Cd hint.cx.0.irq="15"
+.Cd hint.cx.0.drq="7"
+.Pp
+The base i/o port address specified in
+.Pa /boot/device.hints
+must match the port address set by jumpers on the board.
 The DMA i/o channel and interrupt request numbers are configured
 by software at adapter initialization.  Legal values are:
 .Pp
diff --git a/share/man/man4/man4.i386/cy.4 b/share/man/man4/man4.i386/cy.4
index 1d190e1..265f0ad 100644
--- a/share/man/man4/man4.i386/cy.4
+++ b/share/man/man4/man4.i386/cy.4
@@ -45,8 +45,27 @@
 .Nd Cyclades Cyclom-Y serial driver
 .Sh SYNOPSIS
 .Cd "options CY_PCI_FASTINTR"
-.Cd "device cy0 at isa? irq 10 iomem 0xd4000 iosiz 0x2000"
-.Cd "device cy1 at isa? irq 11 iomem 0xd6000 iosiz 0x2000"
+.Cd "device cy 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.cy.0.at="isa"
+.Cd hint.cy.0.irq="10"
+.Cd hint.cy.0.maddr="0xd4000"
+.Cd hint.cy.0.msize="0x2000"
+.Pp
+If you have two cards:
+.Cd "options CY_PCI_FASTINTR"
+.Cd "device cy 2"
+.Pp
+.Cd hint.cy.0.at="isa"
+.Cd hint.cy.0.irq="10"
+.Cd hint.cy.0.maddr="0xd4000"
+.Cd hint.cy.0.msize="0x2000"
+.Cd hint.cy.1.at="isa"
+.Cd hint.cy.1.irq="11"
+.Cd hint.cy.1.maddr="0xd6000"
+.Cd hint.cy.1.msize="0x2000"
 .Pp
 Minor numbering:
 .Pp
diff --git a/share/man/man4/man4.i386/el.4 b/share/man/man4/man4.i386/el.4
index caf3f1d..db416ac 100644
--- a/share/man/man4/man4.i386/el.4
+++ b/share/man/man4/man4.i386/el.4
@@ -30,7 +30,13 @@
 .Nm el
 .Nd Ethernet driver for 3Com Etherlink 3C501 device driver
 .Sh SYNOPSIS
-.Cd "device el0 at isa? port 0x300 irq 9"
+.Cd "device el 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.el.0.at="isa"
+.Cd hint.el.0.port="0x300"
+.Cd hint.el.0.irq="9"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/ex.4 b/share/man/man4/man4.i386/ex.4
index f999309..1741b71 100644
--- a/share/man/man4/man4.i386/ex.4
+++ b/share/man/man4/man4.i386/ex.4
@@ -32,15 +32,15 @@
 .Nm ex
 .Nd "Ethernet device driver for the Intel EtherExpress Pro/10 and Pro/10+"
 .Sh SYNOPSIS
-.Cd "device ex0 at isa? port? irq ?"
+.Cd "device ex"
 .Sh DESCRIPTION
 The
 .Nm
 driver provides support for the 16-bit PCI Intel EtherExpress Pro/10
 and Pro/10+ Ethernet cards based on the Intel i82595 chip.
 .Pp
-If the port start address isn't found, the card will be searched for in the
-I/O address range 0x200 - 0x3a0.  If the IRQ isn't specified, it will be
+The card will be searched for in the
+I/O address range 0x200 - 0x3a0.  If the IRQ will be
 read from the EEPROM on the card.  For correct operation on newer
 cards the Plug-N-Play support should be disabled.
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4
index 57a958b..07b6d42 100644
--- a/share/man/man4/man4.i386/fe.4
+++ b/share/man/man4/man4.i386/fe.4
@@ -29,7 +29,13 @@
 .Nm fe
 .Nd Fujitsu MB86960A/MB86965A based Ethernet adapters
 .Sh SYNOPSIS
-.Cd "device fe0 at isa? port 0x300 irq ?"
+.Cd "device fe 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.fe.0.at="isa"
+.Cd hint.fe.0.port="0x300"
+.Cd hint.fe.0.flags="0x0"
 .Sh DESCRIPTION
 The
 .Nm
@@ -49,7 +55,9 @@ It currently works with Fujitsu FMV-180 series for ISA,
 Allied-Telesis AT1700 series and RE2000 series for ISA,
 and Fujitsu MBH10302 PC card.
 .Ss Parameters
-On the kernel configuration file, two parameters,
+In the
+.Pa /boot/device.hints
+file, two parameters,
 .Ar port
 and
 .Ar irq ,
@@ -57,8 +65,6 @@ must be specified to reflect adapter hardware settings.
 Another parameter
 .Ar flags
 can be specified to provide additional configuration as an option.
-Other parameters of the device statement
-must appear as described on the synopsis.
 .Pp
 The
 .Ar port
@@ -66,8 +72,9 @@ parameter specifies a base I/O port address of the adapter.
 It must match with the hardware setting of the adapter.
 The
 .Ar port
-may be a left unspecified as
-.Dq Li \&? .
+may be left unspecified by removing
+.Dl hint.fe.0.port="..."
+from the file.
 In that case, the driver tries to detect the hardware setting
 of the I/O address automatically.
 This feature may not work with some adapter hardware.
@@ -77,8 +84,9 @@ The
 parameter specifies an IRQ number used by the adapter.
 It must match the hardware setting of the adapter.
 .Ar Irq
-may be left unspecified as
-.Dq Li \&? ;
+may be left unspecified by removing
+.Dl hint.fe.0.irq="..."
+from the file.
 in that case, the driver tries to detect
 the hardware setting of the IRQ automatically.
 This feature may not work on some adapters.
@@ -187,23 +195,24 @@ Automatic I/O port address detection feature of
 works mostly fine for FMV-180 series.
 It works even if there are two or more FMV-180s in a system.
 However, some combination of other adapters may confuse the driver.
-It is recommended not to use
-.Em "port ?"
+It is recommended to explicitly specify
+.Ar port
 when you experience some difficulties with hardware probe.
 .Pp
 Automatic IRQ detection feature of
 .Nm
 works reliably for FMV-180 series.
-It is recommended to use
-.Em "irq ?"
+It is recommended to explicitly specify
+.Ar irq
 always for FMV-180.
 The hardware setting of IRQ is read
 from the configuration EEPROM on the adapter,
 even when the kernel config file specifies an IRQ value.
 The driver will generate a warning message,
-if the IRQ setting specified in the kernel config file
+if the IRQ setting specified in
+.Pa /boot/device.hints
 does not match one stored in EEPROM.
-Then, it will use the value specified in the config file.
+Then, it will use the value specified in the file.
 (This behavior has been changed from the previous releases.)
 .Ss Allied-Telesis AT1700 series and RE2000 series adapters
 Automatic I/O port address detection
@@ -218,8 +227,9 @@ The
 driver
 tries to get IRQ setting from the configuration EEPROM on the board,
 if
-.Dq irq ?\&
-is specified in the configuration file.
+.Ar irq
+is not specified in
+.Pa /boot/device.hints .
 Unfortunately,
 AT1700 series and RE2000 series seems to have two types of models;
 One type allows IRQ selection from 3/4/5/9,
diff --git a/share/man/man4/man4.i386/ie.4 b/share/man/man4/man4.i386/ie.4
index b19625e..72ec17e 100644
--- a/share/man/man4/man4.i386/ie.4
+++ b/share/man/man4/man4.i386/ie.4
@@ -11,7 +11,18 @@
 .Nm ie
 .Nd ethernet device driver
 .Sh SYNOPSIS
-.Cd "device ie0 at isa? port 0x360 irq 7 iomem 0xd0000"
+.Cd "device ie 2"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.ie.0.at="isa"
+.Cd hint.ie.0.port="0x300"
+.Cd hint.ie.0.irq="5"
+.Cd hint.ie.0.maddr="0xd0000"
+.Cd hint.ie.1.at="isa"
+.Cd hint.ie.1.port="0x360"
+.Cd hint.ie.1.irq="7"
+.Cd hint.ie.1.maddr="0xd0000"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/le.4 b/share/man/man4/man4.i386/le.4
index c5f1588..07f3711 100644
--- a/share/man/man4/man4.i386/le.4
+++ b/share/man/man4/man4.i386/le.4
@@ -32,7 +32,14 @@
 .Nm le
 .Nd DEC EtherWORKS II/III Ethernet device driver
 .Sh SYNOPSIS
-.Cd "device le0 at isa? port 0x300 irq 5 iomem 0xd0000"
+.Cd "device le 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.le.0.at="isa"
+.Cd hint.le.0.port="0x300"
+.Cd hint.le.0.irq="5"
+.Cd hint.le.0.maddr="0xd0000"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/lnc.4 b/share/man/man4/man4.i386/lnc.4
index bcc5326..f45c36f 100644
--- a/share/man/man4/man4.i386/lnc.4
+++ b/share/man/man4/man4.i386/lnc.4
@@ -32,7 +32,14 @@
 .Nm lnc
 .Nd AMD Lance/PCnet Ethernet device driver
 .Sh SYNOPSIS
-.Cd "device lnc0 at isa? port 0x280 irq 10 drq 0"
+.Cd "device lnc 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.lnc.0.at="isa"
+.Cd hint.lnc.0.port="0x280"
+.Cd hint.lnc.0.irq="10"
+.Cd hint.lnc.0.drq="0"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/matcd.4 b/share/man/man4/man4.i386/matcd.4
index 44d3b78..e66b128 100644
--- a/share/man/man4/man4.i386/matcd.4
+++ b/share/man/man4/man4.i386/matcd.4
@@ -91,9 +91,11 @@
 .Nm matcd
 .Nd Matsushita (Panasonic) CD-ROM driver
 .Sh SYNOPSIS
-.Cd "device matcd[0-4] at isa? port [?| addr]"
-.Cd "/dev/[r]matcd[0-15][a|c]
-.Cd "/dev/[r]matcd[0-15]l[a|c]
+.Cd "device matcd 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.matcd.0.at="isa"
 .Sh DESCRIPTION
 The
 .Nm
@@ -122,17 +124,16 @@ to support and delete the device entries that you don't want.
 .Pp
 In this file, you will find an entry like:
 .Bd -literal -offset indent
-device  matcd0  at  isa?  port  ?
+device  matcd 1
 .Ed
 .Pp
 To support two host interfaces, change the file so it reads:
 .Bd -literal -offset indent
-device  matcd0  at  isa?  port  ?
-device  matcd1  at  isa?  port  ?
+device  matcd 2
 .Ed
 .Pp
-(If you want to support up to three or four host interfaces, add
-additional entries).
+(If you want to support up to three or four host interfaces,
+increase the number at the end of the line).
 .Pp
 Note that the kernel configuration does not need to be modified to support
 up to four drives on a single host interface.  It is also not necessary to
@@ -153,29 +154,26 @@ where the CD-ROM host interfaces are located.  For example, by default most
 SoundBlaster cards have the Matsushita CD-ROM host interface
 located at I/O port 0x230.  (This is 0x10 above the I/O port for the
 audio section of the card.)  If this is the case for your system, you could
-change where the kernel looks for the hardware by using the -c option at
-the kernel boot prompt.  This will load the kernel and then give you the
-opportunity to change settings for any of the devices included the kernel.
+change where the kernel looks for the hardware by entering a line in
+.Pa /boot/device.hints .
 For example, to change the I/O port for
 .Nm
-adapter zero to 0x340, you would type
-.Pp
-.Dl "config> port matcd0c 0x340"
+adapter zero to 0x340, you would put
 .Pp
-If you recompile the kernel, you can change the entry in the kernel
-configuration file to specify a specific address by changing an entry
-like this:
+.Dl hint.matcd.0.port="0x340"
 .Pp
-.Dl "device  matcd0  at  isa?  port  0x230"
+in the file.
 .Pp
 With this change, the
 .Nm
-driver will only look at I/O port 0x230 for the first CD-ROM host interface
+driver will only look at I/O port 0x340 for the first CD-ROM host interface
 and will not disturb any other I/O ports.
 .Pp
-Once you have adjusted the kernel configuration file, it is necessary
-to configure and recompile the kernel, install it and reboot for the
-changes to take effect.
+You can specify the I/O port for the second, third, and fourth
+adapters in the same fashion:
+.Pp
+.Dl hint.matcd.0.port="0x230"
+.Dl hint.matcd.1.port="0x340"
 .Sh SUPPORTED HARDWARE
 At this time, there are only two known drive models that work with the
 .Nm
diff --git a/share/man/man4/man4.i386/mcd.4 b/share/man/man4/man4.i386/mcd.4
index 11136fa..8d254f8 100644
--- a/share/man/man4/man4.i386/mcd.4
+++ b/share/man/man4/man4.i386/mcd.4
@@ -33,7 +33,13 @@
 .Nm mcd
 .Nd Mitsumi CD-ROM driver
 .Sh SYNOPSIS
-.Cd "device mcd0 at isa? port 0x300 irq 10"
+.Cd "device mcd 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.mcd.0.at="isa"
+.Cd hint.mcd.0.port="0x300"
+.Cd hint.mcd.0.irq="10"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/mse.4 b/share/man/man4/man4.i386/mse.4
index 64b2748..d79b6bf 100644
--- a/share/man/man4/man4.i386/mse.4
+++ b/share/man/man4/man4.i386/mse.4
@@ -20,7 +20,13 @@
 .Nd bus and InPort mice driver
 .Sh SYNOPSIS
 .\" .Cd "options MSE_XXX=N"
-.Cd "device mse0 at isa? port 0x23c irq 5"
+.Cd "device mse"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.mse.0.at="isa"
+.Cd hint.mse.0.port="0x23c"
+.Cd hint.mse.0.irq="5"
 .Sh DESCRIPTION
 The
 .Nm
@@ -342,13 +348,24 @@ movement counts as described in
 .Em devfs .
 .El
 .Sh EXAMPLES
-.Dl "device mse0 at isa? port 0x23c irq 5"
+.Dl "device mse"
+.Pp
+In
+.Pa /boot/device.hints :
+.Dl hint.mse.0.at="isa"
+.Dl hint.mse.0.port="0x23c"
+.Dl hint.mse.0.irq="5"
 .Pp
 Add the
 .Nm
 driver at the primary port address with the IRQ 5.
 .Pp
-.Dl "device mse1 at isa? port 0x238 flags 0x30 irq 4"
+.Dl "device mse"
+.Pp
+.Dl hint.mse.1.at="isa"
+.Dl hint.mse.1.port="0x238"
+.Dl hint.mse.1.irq="4"
+.Dl hint.mse.1.flags="0x30"
 .Pp
 Define the
 .Nm
diff --git a/share/man/man4/man4.i386/pcf.4 b/share/man/man4/man4.i386/pcf.4
index ed61869..f5e9088 100644
--- a/share/man/man4/man4.i386/pcf.4
+++ b/share/man/man4/man4.i386/pcf.4
@@ -31,7 +31,13 @@
 .Nm pcf
 .Nd Philips I2C bus controller
 .Sh SYNOPSIS
-.Cd "device pcf0 at isa? port? irq 5"
+.Cd "device pcf"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.pcf.0.at="isa"
+.Cd hint.pcf.0.port="0x320"
+.Cd hint.pcf.0.irq="5"
 .Pp
 For one or more iicbus busses:
 .Cd "device iicbus"
diff --git a/share/man/man4/man4.i386/scd.4 b/share/man/man4/man4.i386/scd.4
index a1668f5..9caec04 100644
--- a/share/man/man4/man4.i386/scd.4
+++ b/share/man/man4/man4.i386/scd.4
@@ -33,7 +33,12 @@
 .Nm scd
 .Nd Sony CDU31/33 CD-ROM driver
 .Sh SYNOPSIS
-.Cd "device scd0 at isa? port 0x230"
+.Cd "device scd 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.scd.0.at="isa"
+.Cd hint.scd.0.port="0x230"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man4/man4.i386/sr.4 b/share/man/man4/man4.i386/sr.4
index 289811e..ffb104a 100644
--- a/share/man/man4/man4.i386/sr.4
+++ b/share/man/man4/man4.i386/sr.4
@@ -37,8 +37,15 @@
 .Nm sr
 .Nd synchronous RISCom/N2 / WANic 400/405 device driver
 .Sh SYNOPSIS
-.Cd "device sr0 at isa? port 0x300 irq 10 iomem 0xd0000"
-.Cd "device sr1 at isa? port 0x310 irq 11 flags 0x1 iomem 0xd0000"
+.Cd "device sr"
+.Pp
+For ISA cards, in
+.Pa /boot/device.hints :
+.Cd hint.sr.0.at="isa"
+.Cd hint.sr.0.port="0x300"
+.Cd hint.sr.0.irq="10"
+.Cd hint.sr.0.maddr="0xd0000"
+.Cd hint.sr.0.flags="0x0"
 .Pp
 .Cd "device sppp"
 .Sh DESCRIPTION
@@ -47,6 +54,16 @@ The
 driver supports the RISCom/N2 ISA cards and the WANic 400/405 PCI cards
 that is based on the HD64570 chip.
 .Pp
+If you have ISA cards, you need to specify the resources for them in
+.Pa /boot/device.hints .
+If you have the second ISA card, add
+.Pp
+.Dl hint.sr.1.at="isa"
+.Dl hint.sr.1.port="0x310"
+.Dl hint.sr.1.irq="11"
+.Dl hint.sr.1.maddr="0xd0000"
+.Dl hint.sr.1.flags="0x0"
+.Pp
 The standard
 .Fx
 sppp code is used for the link level layer.
@@ -64,7 +81,9 @@ Alternately, the driver can be compiled to support
 .Pp
 The
 .Em flags
-field is optional.
+specification in
+.Pa /boot/device.hints
+is optional.
 If it isn't specified, the driver will
 assume the following:
 .Pp
@@ -87,12 +106,6 @@ Use separate external clocks for transmit and receive on port 0.
 .It Em 0x40
 Use separate external clocks for transmit and receive on port 1.
 .El
-.Sh NUMBERING
-Only one line for each card is needed in the kernel configuration file.
-The first card's ports will be installed from sr0. The numbering of the
-next card will continue where the first stopped, eg. if the first card
-is a two port card it will use sr0 and sr1. The next card will then
-start at sr2.
 .Pp
 The card only supports IRQ 3, 4, 5, 7, 10, 11, 12 and 15.
 .Pp
diff --git a/share/man/man4/man4.i386/wt.4 b/share/man/man4/man4.i386/wt.4
index dbe8391..4700b4f 100644
--- a/share/man/man4/man4.i386/wt.4
+++ b/share/man/man4/man4.i386/wt.4
@@ -30,7 +30,14 @@
 .Nm wt
 .Nd Archive/Wangtek cartridge tape driver
 .Sh SYNOPSIS
-.Cd "device wt0 at isa? port 0x300 irq 5 drq 1"
+.Cd "device wt 1"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.wt.0.at="isa"
+.Cd hint.wt.0.port="0x300"
+.Cd hint.wt.0.irq="5"
+.Cd hint.wt.0.drq="1"
 .Sh DESCRIPTION
 The
 .Nm