ed replaced by ec/ne/we drivers.

3 files changed, 20 insertions, 19 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 2d06c51abd1..bf1141ef130 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.79 1998/09/21 06:00:16 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.80 1998/09/22 08:06:05 fgsch Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -149,10 +149,11 @@ acd*	at atapibus? drive?
 
 wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives
 
-ed0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC, 3C503, and NE[12]000
-ed1	at isa? port 0x250 iomem 0xd8000 irq 9	#   ethernet cards
-ed2	at isa? port 0x300 iomem 0xcc000 irq 10
-ed3	at isa? port 0x240 iomem 0xd8000 irq 9
+we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet series
+we1	at isa? port 0x300 iomem 0xcc000 irq 10	#
+ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet cards
+ne0	at isa? port 0x240 iomem 0xd8000 irq 9	# NE[12]000 ethernet cards
+ne*	at isapnp?				# NE[12]000 PnP ethernet cards
 eg0	at isa? port 0x310 irq 5		# 3C505/Etherlink+ ethernet cards
 el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
 ep0	at isa? port ? irq ?			# 3C509 ethernet cards
@@ -169,10 +170,10 @@ le*	at pci? dev ? function ?		# PCnet-PCI based ethernet cards
 le*	at isapnp?
 de*	at pci? dev ? function ?		# DC21X4X-based ethernet cards
 fxp*	at pci? dev ? function ?		# EtherExpress 10/100B ethernet cards
-ed*	at pci? dev ? function ?		# NE2000-compat ethernet cards
+ne*	at pci? dev ? function ?		# NE2000-compat ethernet cards
 ep0	at pci? dev ? function ?		# 3C590 ethernet cards
 ep*	at pci? dev ? function ?		# 3C590 ethernet cards
-#ed*	at pcmcia? function ?			# PCMCIA based ed cards
+#ne*	at pcmcia? function ?			# PCMCIA based ne cards
 ep*	at pcmcia? function ?			# PCMCIA based ep cards
 sm*	at pcmcia? function ?			# PCMCIA based sm cards
 fpa*	at pci? dev ? function ?		# DEC DEFPA FDDI cards
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index c4564c92391..90d081d74ba 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.38 1998/09/21 06:00:17 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.39 1998/09/22 08:06:06 fgsch Exp $
 #	from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp 
 #
 #	Install kernels no longer support X.
@@ -155,10 +155,10 @@ acd*	at atapibus? drive?
 
 #wt0	at isa? port 0x308 irq 5 drq 1		# Archive/Wangtek QIC tapes
 
-ed0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC, 3C503, and NE[12]000
-ed1	at isa? port 0x250 iomem 0xd8000 irq 9	#   ethernet cards
-ed2	at isa? port 0x300 iomem 0xcc000 irq 10
-ed3	at isa? port 0x240 iomem 0xd8000 irq 9
+we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC 80x3 ethernet series
+we1	at isa? port 0x300 iomem 0xcc000 irq 10	#
+ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3C503 ethernet cards
+ne0	at isa? port 0x240 iomem 0xd8000 irq 9	# NE[12]000 ethernet cards
 #eg0	at isa? port 0x310 irq 5		# 3C505/Etherlink+ ethernet cards
 #el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
 ep0	at isa? port ? irq ?			# 3C509 ethernet cards
@@ -177,8 +177,8 @@ de*	at pci? dev ? function ?		# DC21X4X-based ethernet cards
 fxp*	at pci? dev ? function ?		# EtherExpress 10/100B ethernet cards
 ep0	at pci? dev ? function ?		# 3C590 ethernet cards
 ep*	at pci? dev ? function ?		# 3C590 ethernet cards
-ed*	at pci? dev ? function ?		# NE2000-compat ethernet cards
-#ed*	at pcmcia? function ?			# PCMCIA based ed cards
+ne*	at pci? dev ? function ?		# NE2000-compat ethernet cards
+#ne*	at pcmcia? function ?			# PCMCIA based ne cards
 ep*	at pcmcia? function ?			# PCMCIA based ep cards
 sm*	at pcmcia? function ?			# PCMCIA based sm cards
 #fpa*	at pci? dev ? function ?		# DEC DEFPA FDDI cards
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index d6229d96f76..390ebe1c14f 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.46 1998/09/11 10:33:13 fgsch Exp $
+#	$OpenBSD: files.i386,v 1.47 1998/09/22 08:06:07 fgsch Exp $
 #	$NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
 #
 # new style config file for i386 architecture
@@ -181,11 +181,11 @@ file	arch/i386/isa/spkr.c		spkr needs-flag
 # National Semiconductor DS8390/WD83C690-based boards
 # (WD/SMC 80x3 family, SMC Ultra [8216], 3Com 3C503, NE[12]000, and clones)
 # XXX conflicts with other ports; can't be in files.isa
-device	ed: ether, ifnet
-attach	ed at isa with ed_isa
+#device	ed: ether, ifnet
+#attach	ed at isa with ed_isa
 #attach	ed at pcmcia with ed_pcmcia
-attach	ed at pci with ed_pci
-file	dev/isa/if_ed.c			ed & (ed_isa | ed_pcmcia | ed_pci) needs-flag
+#attach	ed at pci with ed_pci
+#file	dev/isa/if_ed.c			ed & (ed_isa | ed_pcmcia | ed_pci) needs-flag
 
 # Adaptec AHA-284x VL SCSI controllers
 # device declaration in sys/conf/files