update for recent sm(4) changes

ok jmc

6 files changed, 49 insertions, 16 deletions

diff --git a/share/man/man4/isa.4 b/share/man/man4/isa.4
index 7ea4345fb3a..40f79624265 100644
--- a/share/man/man4/isa.4
+++ b/share/man/man4/isa.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isa.4,v 1.34 2005/09/19 21:21:12 jmc Exp $
+.\"	$OpenBSD: isa.4,v 1.35 2006/02/01 19:33:24 martin Exp $
 .\"	$NetBSD: isa.4,v 1.19 2000/03/18 16:54:37 augustss Exp $
 .\"
 .\" Copyright (c) 2000 Theo de Raadt.  All rights reserved.
@@ -195,7 +195,7 @@ Novel NE2000 and compatible
 .Tn Ethernet
 interfaces.
 .It Xr sm 4
-SMC91C9x-based
+SMC91C9x and SMC91C1xx-based
 .Tn Ethernet
 interfaces.
 .It Xr we 4
diff --git a/share/man/man4/man4.amd64/intro.4 b/share/man/man4/man4.amd64/intro.4
index fa83d6c32b8..cb1c7f3688c 100644
--- a/share/man/man4/man4.amd64/intro.4
+++ b/share/man/man4/man4.amd64/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.17 2005/08/28 04:22:30 jsg Exp $
+.\"	$OpenBSD: intro.4,v 1.18 2006/02/01 19:33:25 martin Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -327,8 +327,8 @@ Safenet SafeXcel 1141/1741 crypto accelerator.
 SiS 900, Sis 7016 and NS DP83815 Fast Ethernet.
 .It Xr sk 4
 SysKonnect 984x Gigabit Ethernet (9841/9842/9843/9844).
-.\".It Xr sm 4
-.\"SMC91C9x Ethernet.
+.It Xr sm 4
+SMC91C9x and SMC91C1xx-based Ethernet.
 .\".It Xr speaker 4
 .\"Console speaker.
 .\".It Xr ste 4
diff --git a/share/man/man4/man4.i386/intro.4 b/share/man/man4/man4.i386/intro.4
index e6d7c275a9f..d7ba054b0ac 100644
--- a/share/man/man4/man4.i386/intro.4
+++ b/share/man/man4/man4.i386/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.67 2005/09/12 10:08:32 jmc Exp $
+.\"	$OpenBSD: intro.4,v 1.68 2006/02/01 19:33:25 martin Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
@@ -347,7 +347,7 @@ SiS 900, Sis 7016 and NS DP83815 Fast Ethernet.
 .It Xr sk 4
 SysKonnect 984x Gigabit Ethernet (9841/9842/9843/9844).
 .It Xr sm 4
-SMC91C9x Ethernet.
+SMC91C9x and SMC91C1xx-based Ethernet.
 .It Xr speaker 4
 Console speaker.
 .It Xr ste 4
diff --git a/share/man/man4/man4.mac68k/intro.4 b/share/man/man4/man4.mac68k/intro.4
index 1855a0a8692..e0259edc9d3 100644
--- a/share/man/man4/man4.mac68k/intro.4
+++ b/share/man/man4/man4.mac68k/intro.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.4,v 1.16 2006/01/13 01:46:58 martin Exp $
+.\"	$OpenBSD: intro.4,v 1.17 2006/02/01 19:33:25 martin Exp $
 .\"	$NetBSD: intro.4,v 1.4 1997/03/28 00:29:35 veego Exp $
 .\"
 .\" Copyright (c) 1990, 1991 Regents of the University of California.
@@ -123,6 +123,8 @@ MACE Ethernet interface.
 Alternate driver for the
 .Tn NCR
 5380 built-in SCSI interface.
+.It Xr sm 4
+SMC91C9x and SMC91C1xx-based Ethernet,
 .It Xr sn 4
 DP83932-based Ethernet interface (SONIC).
 .It Xr zsc 4
diff --git a/share/man/man4/pcmcia.4 b/share/man/man4/pcmcia.4
index 8f695bf08a9..be99410a809 100644
--- a/share/man/man4/pcmcia.4
+++ b/share/man/man4/pcmcia.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pcmcia.4,v 1.41 2005/05/24 20:08:54 uwe Exp $
+.\"	$OpenBSD: pcmcia.4,v 1.42 2006/02/01 19:33:24 martin Exp $
 .\"	$NetBSD: pcmcia.4,v 1.4 1998/06/07 09:10:30 enami Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -103,7 +103,7 @@ Raytheon Raylink / WebGear Aviator IEEE 802.11FH 2Mbps wireless controllers.
 .It Xr rln 4
 Proxim RangeLAN2 PC-Card.
 .It Xr sm 4
-Megahertz Ethernet cards.
+SMC91C9x and SMC91C1xx-based Ethernet.
 .It Xr wi 4
 WaveLAN/IEEE, PRISM-II and Spectrum24 IEEE 802.11b cards.
 .It Xr xe 4
diff --git a/share/man/man4/sm.4 b/share/man/man4/sm.4
index 92e6dfacbfa..c1fbf92ec1e 100644
--- a/share/man/man4/sm.4
+++ b/share/man/man4/sm.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sm.4,v 1.13 2006/01/29 17:42:56 jmc Exp $
+.\"	$OpenBSD: sm.4,v 1.14 2006/02/01 19:33:24 martin Exp $
 .\"	$NetBSD: sm.4,v 1.3 1998/08/09 00:39:02 thorpej Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -36,12 +36,12 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 11, 1998
+.Dd January 31, 2006
 .Dt SM 4
 .Os
 .Sh NAME
 .Nm sm
-.Nd SMC91Cxx-based Ethernet driver
+.Nd SMC91C9x and SMC91C1xx-based Ethernet
 .Sh SYNOPSIS
 .Cd "sm0 at isa? port 0x300 irq 10"
 .Cd "sm* at pcmcia?"
@@ -50,7 +50,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-device driver supports SMC91C9x-based and SMC91C1xx-based Ethernet interfaces.
+device driver supports SMC91C9x and SMC91C1xx-based Ethernet interfaces.
 .Pp
 The ISA attachment of the
 .Nm
@@ -68,8 +68,35 @@ The NuBus attachment of the
 .Nm
 driver supports SMC-based Ethernet cards for mac68k.
 .Sh MEDIA SELECTION
-The SMC91C1xx supports the MII interface.
-The SMC91C9x supports AUI and UTP media types.
+The SMC91C1xx supports the following media types:
+.Bl -tag -width full-duplex
+.It autoselect
+Enable autoselection of the media type and options.
+The user can manually override the autoselected mode by adding media options
+to the appropriate
+.Xr hostname.if 5
+file.
+.It 10baseT
+Set 10Mbps operation.
+The
+.Ar mediaopt
+option can also be used to select either
+.Ar full-duplex
+or
+.Ar half-duplex
+modes.
+.It 100baseTX
+Set 100Mbps (Fast Ethernet) operation.
+The
+.Ar mediaopt
+option can also be used to select either
+.Ar full-duplex
+or
+.Ar half-duplex
+modes.
+.El
+.Pp
+The SMC91C9x supports AUI and UTP media types:
 .Pp
 To enable the AUI media, select the
 .Em 10base5
@@ -84,6 +111,9 @@ To select UTP, select the
 or
 .Em utp
 media type.
+.Pp
+For more information on configuring this device, see
+.Xr ifconfig 8 .
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "sm0: unable to read MAC address from CIS"
@@ -98,6 +128,7 @@ corrupted.
 .Xr isa 4 ,
 .Xr netintro 4 ,
 .Xr nsphy 4 ,
+.Xr nubus 4 ,
 .Xr pcmcia 4 ,
 .Xr hostname.if 5 ,
 .Xr ifconfig 8