Recent bus_space changes make ne at pcmcia work out of the box,

tested by pb@

3 files changed, 28 insertions, 9 deletions

diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 8c64a64590c..4124bb14ce6 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.70 2003/06/23 09:30:36 miod Exp $
+#	$OpenBSD: GENERIC,v 1.71 2003/06/25 17:40:00 miod Exp $
 # 	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -177,9 +177,6 @@ ie4	at vmes0 addr 0xff2dff02 level 5 vect 0x7c
 
 # HappyMeal ethernet (will not work on sun4c)
 hme*	at sbus?
-# Media Independent Interface (mii) drivers (required by hme)
-nsphy*	at mii? phy ?				# NS and compatible PHYs
-qsphy*	at mii? phy ?				# Quality Semi QS6612 PHYs
 
 # Quad-ethernet glue device, and sub-devices
 qec*	at sbus?
@@ -311,6 +308,15 @@ pcmcia*	at tslot? socket ?
 
 # PCMCIA devices
 wi*	at pcmcia? function ?
+ne*	at pcmcia? function ?
+
+# Media Independent Interface (mii) drivers (required by hme and ne)
+bmtphy*	at mii? phy ?
+lxtphy*	at mii? phy ?
+nsphy*	at mii? phy ?				# NS and compatible PHYs
+nsphyter* at mii? phy ?
+qsphy*	at mii? phy ?				# Quality Semi QS6612 PHYs
+ukphy*	at mii? phy ?
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index c7e53636de5..35fba298ddd 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4C,v 1.45 2003/06/23 09:30:36 miod Exp $
+#	$OpenBSD: SUN4C,v 1.46 2003/06/25 17:40:00 miod Exp $
 # 	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -143,6 +143,13 @@ pcmcia*	at stp? socket ?
 
 # PCMCIA devices
 wi*	at pcmcia? function ?
+ne*	at pcmcia? function ?
+
+# Media Independent Interface (mii) drivers (required by ne)
+bmtphy*	at mii? phy ?
+lxtphy*	at mii? phy ?
+nsphyter* at mii? phy ?
+ukphy*	at mii? phy ?
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index af517d1c7b5..ddefbbfda34 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.55 2003/06/23 09:30:36 miod Exp $
+#	$OpenBSD: SUN4M,v 1.56 2003/06/25 17:40:00 miod Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -117,9 +117,6 @@ le*	at lebuffer?					#
 
 # HappyMeal ethernet
 hme*	at sbus?
-# Media Independent Interface (mii) drivers (required by hme)
-nsphy*	at mii? phy ?				# NS and compatible PHYs
-qsphy*	at mii? phy ?				# Quality Semi QS6612 PHYs
 
 # Quad-ethernet glue device, and sub-devices
 qec*	at sbus?
@@ -194,6 +191,15 @@ pcmcia*	at tslot? socket ?
 
 # PCMCIA devices
 wi*	at pcmcia? function ?
+ne*	at pcmcia? function ?
+
+# Media Independent Interface (mii) drivers (required by hme and ne)
+bmtphy*	at mii? phy ?
+lxtphy*	at mii? phy ?
+nsphy*	at mii? phy ?				# NS and compatible PHYs
+nsphyter* at mii? phy ?
+qsphy*	at mii? phy ?				# Quality Semi QS6612 PHYs
+ukphy*	at mii? phy ?
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.