Move hme.4 to MI since it now works on 3 archs for sure

5 files changed, 9 insertions, 126 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 4c5586a088d..60d1fceb677 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.229 2003/01/08 02:11:38 krw Exp $
+#	$OpenBSD: Makefile,v 1.230 2003/02/10 22:40:55 jason Exp $
 
 MAN=	aac.4 ac97.4 addcom.4 adv.4 aha.4 ahb.4 ahc.4 aic.4 \
 	ami.4 amdpm.4 amphy.4 an.4 aria.4 ast.4 atalk.4 atapiscsi.4 \
@@ -9,7 +9,7 @@ MAN=	aac.4 ac97.4 addcom.4 adv.4 aha.4 ahb.4 ahc.4 aic.4 \
 	dc.4 ddb.4 de.4 dpt.4 drum.4 eap.4 ec.4 \
 	eephy.4 ef.4 eg.4 eisa.4 el.4 em.4 emu.4 enc.4 ep.4 esa.4 esis.4 \
 	eso.4 ess.4 exphy.4 fd.4 fdc.4 fpa.4 \
-	fms.4 fxp.4 gem.4 gdt.4 gpr.4 gre.4 gtp.4 hifn.4 hsq.4 icmp.4 \
+	fms.4 fxp.4 gem.4 gdt.4 gpr.4 gre.4 gtp.4 hifn.4 hme.4 hsq.4 icmp.4 \
 	icsphy.4 idp.4 iha.4 ifmedia.4 \
 	inet.4 inphy.4 iop.4 iopsp.4 ioprbs.4 iophy.4 ip.4 ipcomp.4 ipsec.4 \
 	isa.4 isapnp.4 ises.4 iso.4 isp.4 \
diff --git a/share/man/man4/man4.sparc64/hme.4 b/share/man/man4/hme.4
index ee4c461481f..b222fe0c54f 100644
--- a/share/man/man4/man4.sparc64/hme.4
+++ b/share/man/man4/hme.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: hme.4,v 1.4 2002/10/01 21:03:27 miod Exp $
+.\"     $OpenBSD: hme.4,v 1.1 2003/02/10 22:40:55 jason Exp $
 .\"
 .\" Copyright (c) 1998 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -30,11 +30,11 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd October 5, 2001
-.Dt HME 4 sparc64
+.Dt HME 4
 .Os
 .Sh NAME
 .Nm hme
-.Nd SPARC National DP83840 ethernet interface
+.Nd Sun Happy Meal Ethernet
 .Sh SYNOPSIS
 .Cd "hme* at pci? dev ? function ?"
 .Cd "hme* at sbus? slot ? offset ?"
diff --git a/share/man/man4/man4.sparc/Makefile b/share/man/man4/man4.sparc/Makefile
index 00ecee48621..d00cd10b2fb 100644
--- a/share/man/man4/man4.sparc/Makefile
+++ b/share/man/man4/man4.sparc/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.26 2002/11/23 21:10:59 miod Exp $
+#	$OpenBSD: Makefile,v 1.27 2003/02/10 22:40:55 jason Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 2/16/94
 
 MAN=	audioamd.4 audiocs.4 autoconf.4 be.4 bwtwo.4 cgtwo.4 cgthree.4 \
 	cgfour.4 cgsix.4 cgeight.4 cgtwelve.4 cgfourteen.4 daadio.4 \
-	esp.4 fd.4 fga.4 hme.4 ie.4 intro.4 le.4 led.4 magma.4 mem.4 \
+	esp.4 fd.4 fga.4 ie.4 intro.4 le.4 led.4 magma.4 mem.4 \
 	openprom.4 pnozz.4 qe.4 qec.4 scf.4 si.4 spif.4 sw.4 tctrl.4 \
 	tcx.4 vigra.4 xbox.4 xd.4 xy.4 zs.4
 MLINKS=	fd.4 fdc.4 \
diff --git a/share/man/man4/man4.sparc/hme.4 b/share/man/man4/man4.sparc/hme.4
deleted file mode 100644
index 8e8c6b99411..00000000000
--- a/share/man/man4/man4.sparc/hme.4
+++ /dev/null
@@ -1,117 +0,0 @@
-.\"     $OpenBSD: hme.4,v 1.11 2002/11/23 20:47:02 miod Exp $
-.\"
-.\" Copyright (c) 1998 Jason L. Wright (jason@thought.net)
-.\" 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.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed by Jason L. Wright
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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 July 12, 1998
-.Dt HME 4 sparc
-.Os
-.Sh NAME
-.Nm hme
-.Nd SPARC National DP83840 ethernet interface
-.Sh SYNOPSIS
-.Cd "hme* at sbus? slot ? offset ?                 " Pq "sun4m"
-.Cd "nsphy* at mii? phy ?                          " Pq "sun4m"
-.Cd "qsphy* at mii? phy ?                          " Pq "sun4m"
-.Sh DESCRIPTION
-The
-.Nm
-interface provides access to the 10Mb/s and 100Mb/s Ethernet networks via the
-.Tn National
-DP83840
-Ethernet 10/100 Mb/s Physical Layer
-or the
-.Tn Quality
-QS6612
-Ethernet MII Transceiver for Category 5 Twisted Pair Cable
-chip sets.
-The
-.Nm
-is found on the SunSwift and Sun QuadFastEthernet boards.
-.Pp
-Each of the host's network addresses
-is specified at boot time with an
-.Dv SIOCSIFADDR
-.Xr ioctl 2 .
-The
-.Nm
-interface employs the address resolution protocol described in
-.Xr arp 4
-to dynamically map between Internet and Ethernet addresses on the local
-network.
-.Pp
-When a
-.Nm
-interface is brought up, by default, it will attempt to auto-negotiate the
-link speed and duplex.
-The speeds, in order of attempt, are: 100Mb/s Full Duplex, 100Mb/s Half Duplex,
-10 Mb/s Full Duplex, and 10 Mb/s Half Duplex.
-.Pp
-The
-.Nm
-supports several media types, which are selected via the
-.Xr ifconfig 8
-command.
-The supported media types are:
-.Bl -tag -width xxxxxxxxxxxxxx -offset indent
-.It media autoselect
-Attempt to autoselect the media type (default)
-.It media 100baseTX mediaopt full-duplex
-Use 100baseTX, full duplex
-.It media 100baseTX Op mediaopt half-duplex
-Use 100baseTX, half duplex
-.It media 10baseT mediaopt full-duplex
-Use 10baseT, full duplex
-.It media 10baseT Op mediaopt half-duplex
-Use 10baseT, half duplex
-.El
-.Sh SEE ALSO
-.Xr arp 4 ,
-.Xr be 4 ,
-.Xr ie 4 ,
-.Xr ifmedia 4 ,
-.Xr inet 4 ,
-.Xr intro 4 ,
-.Xr le 4 ,
-.Xr netintro 4 ,
-.Xr qe 4 ,
-.Xr sbus 4 ,
-.Xr hostname.if 5 ,
-.Xr ifconfig 8
-.Sh HISTORY
-.Ox
-support for the
-.Nm
-first appeared in
-.Ox 2.4 .
-.Sh CAVEATS
-The
-.Nm
-cards will not function in a sun4c class machine,
-due to PROM limitations.
diff --git a/share/man/man4/man4.sparc64/Makefile b/share/man/man4/man4.sparc64/Makefile
index ceb7b455ca1..3a13e216810 100644
--- a/share/man/man4/man4.sparc64/Makefile
+++ b/share/man/man4/man4.sparc64/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.29 2002/11/23 21:11:00 miod Exp $
+#	$OpenBSD: Makefile,v 1.30 2003/02/10 22:40:55 jason Exp $
 
 # TODO: auxio.4 clock.4 timer.4
 MAN=	apio.4 asio.4 audioce.4 audiocs.4 autoconf.4 be.4 beeper.4 bwtwo.4 \
 	cgsix.4 cgthree.4 comkbd.4 creator.4 \
-	ebus.4 esp.4 hme.4 intro.4 le.4 magma.4 mem.4 openprom.4 \
+	ebus.4 esp.4 intro.4 le.4 magma.4 mem.4 openprom.4 \
 	pcons.4 psycho.4 qe.4 qec.4 sab.4 schizo.4 spif.4 \
 	upa.4 uperf.4 vgafb.4 zs.4
 MLINKS=	le.4 lebuffer.4 le.4 ledma.4 \