qec+qe support & OpenBSD tags for everyone

6 files changed, 34 insertions, 12 deletions

diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 38d966fe585..785a6864722 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.33 1998/09/16 23:13:51 jason Exp $
+#	$OpenBSD: GENERIC,v 1.34 1998/10/19 05:43:29 jason Exp $
 # 	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -137,11 +137,6 @@ lebuffer*	at sbus? slot ? offset ?		# sun4m SBus
 le0	at lebuffer0					#
 le*	at lebuffer?					#
 
-# Quad-ethernet glue device, and sub-devices
-qec*		at sbus0 slot ? offset ?
-#me*	at qec?
-be*	at qec?
-
 # sun4/300 and sun4c Ethernet - an AMD 7990 LANCE
 le0	at sbus0 slot ? offset ?			# sun4c on-board
 le*	at sbus? slot ? offset ?
@@ -164,6 +159,11 @@ hme*	at sbus? slot ? offset ?
 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 sbus0 slot ? offset ?
+qe*	at qec?
+be*	at qec?
+
 # Xylogics 753 or 7053 VME SMD disk controllers and disks, found
 # on sun4 systems.
 xdc0	at vmel0 addr 0xffffee80 level 3 vect 0x44
diff --git a/sys/arch/sparc/conf/GENERIC_SCSI3 b/sys/arch/sparc/conf/GENERIC_SCSI3
index f9a61504d97..882c83b569e 100644
--- a/sys/arch/sparc/conf/GENERIC_SCSI3
+++ b/sys/arch/sparc/conf/GENERIC_SCSI3
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC_SCSI3,v 1.23 1998/09/16 23:13:51 jason Exp $
+#	$OpenBSD: GENERIC_SCSI3,v 1.24 1998/10/19 05:43:29 jason Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -155,6 +155,11 @@ hme*	at sbus? slot ? offset ?
 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 sbus0 slot ? offset ?
+qe*	at qec?
+be*	at qec?
+
 # Xylogics 753 or 7053 VME SMD disk controllers and disks, found
 # on sun4 systems.
 xdc0	at vmel0 addr 0xffffee80 level 3 vect 0x44
diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK
index b3b33bb3f84..3fb0b8a9d90 100644
--- a/sys/arch/sparc/conf/RAMDISK
+++ b/sys/arch/sparc/conf/RAMDISK
@@ -1,3 +1,4 @@
+# 	$OpenBSD: RAMDISK,v 1.17 1998/10/19 05:43:30 jason Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -163,6 +164,11 @@ hme*	at sbus? slot ? offset ?
 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 sbus0 slot ? offset ?
+qe*	at qec?
+be*	at qec?
+
 ie1	at vmes0 addr 0xffe88000 level 5 vect 0x75
 ie2	at vmes0 addr 0xff31ff02 level 5 vect 0x76
 ie3	at vmes0 addr 0xff35ff02 level 5 vect 0x77
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index ea1eecd74ec..2b77d03a472 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,3 +1,4 @@
+# 	$OpenBSD: SUN4C,v 1.25 1998/10/19 05:43:30 jason Exp $
 # 	$NetBSD: GENERIC,v 1.19 1995/10/08 11:45:39 pk Exp $
 
 machine		sparc
@@ -112,6 +113,11 @@ hme*	at sbus? slot ? offset ?
 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 sbus0 slot ? offset ?
+qe*	at qec?
+be*	at qec?
+
 #ie0	at obio0 addr 0xf6000000 level 6
 #ie0	at obio0 addr 0x06000000 level 6		# 4/100
 #ie1	at vmes0 addr 0xffe88000 level 5 vect 0x75
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index 0b0e0511099..049a984f250 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.24 1998/09/16 23:13:52 jason Exp $
+#	$OpenBSD: SUN4M,v 1.25 1998/10/19 05:43:30 jason Exp $
 # 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -93,6 +93,11 @@ hme*	at sbus? slot ? offset ?
 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 sbus0 slot ? offset ?
+qe*	at qec?
+be*	at qec?
+
 # Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
 # systems.  If your sun4 system has a cgfour installed in the P4 slot,
 # the P4 entries for "bwtwo" will attach to the overlay plane of the
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index b64b56f46c3..2f65640c739 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.23 1998/09/28 01:23:38 mickey Exp $
+#	$OpenBSD: files.sparc,v 1.24 1998/10/19 05:43:30 jason Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -113,9 +113,9 @@ device	be: ifnet, ether, ifmedia
 attach	be at qec
 file	arch/sparc/dev/be.c		be
 
-device	me {}
-attach	me at qec
-file	arch/sparc/dev/me.c		me
+device	qe: ifnet, ether
+attach	qe at qec
+file	arch/sparc/dev/qe.c		qe
 
 # HappyMeal (hme) ethernet
 device hme: ifnet, ether, mii, ifmedia