Add the if_dc driver and remove all of the al, ax, dm, pn and mx drivers

which it replaces. The new driver supports all of the chips supported
by the ones it replaces, as well as many DEC/Intel 21143 10/100 cards.

This also completes my quest to convert things to miibus and add
Alpha support.

5 files changed, 11 insertions, 15 deletions

diff --git a/release/sysinstall/devices.c b/release/sysinstall/devices.c
index 6bbe45b..e9f2694 100644
--- a/release/sysinstall/devices.c
+++ b/release/sysinstall/devices.c
@@ -91,14 +91,12 @@ static struct _devname {
     { DEVICE_TYPE_FLOPPY,	"fd%d",		"floppy drive unit A",	2, 0, 64, 4, 'b'			},
     { DEVICE_TYPE_FLOPPY,	"wfd%d",	"ATAPI floppy drive unit A",	1, 0, 8, 4, 'b'			},
     { DEVICE_TYPE_FLOPPY,	"worm%d",	"SCSI optical disk / CDR",	23, 0, 1, 4, 'b'		},
-    { DEVICE_TYPE_NETWORK,	"al",		"ADMtek AL981/AN985 PCI ethernet card"				},
-    { DEVICE_TYPE_NETWORK,	"ax",		"ASIX AX88140A PCI ethernet card"				},
     { DEVICE_TYPE_NETWORK,	"fpa",		"DEC DEFPA PCI FDDI card"					},
     { DEVICE_TYPE_NETWORK,	"sr",		"SDL T1/E1 sync serial PCI card"				},
     { DEVICE_TYPE_NETWORK,	"cc3i",		"SDL HSSI sync serial PCI card"					},
     { DEVICE_TYPE_NETWORK,	"en",		"Efficient Networks ATM PCI card"				},
+    { DEVICE_TYPE_NETWORK,	"dc",		"DEC/Intel 21143 (and clones) PCI fast ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"de",		"DEC DE435 PCI NIC or other DC21040-AA based card"		},
-    { DEVICE_TYPE_NETWORK,	"dm",		"Davicom DM9100/DM9102 PCI fast ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"fxp",		"Intel EtherExpress Pro/100B PCI Fast Ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"ed",		"Novell NE1000/2000; 3C503; NE2000-compatible PCMCIA"		},
     { DEVICE_TYPE_NETWORK,	"ep",		"3Com 3C509 ethernet card/3C589 PCMCIA"				},
@@ -109,8 +107,6 @@ static struct _devname {
     { DEVICE_TYPE_NETWORK,	"ix",		"Intel Etherexpress ethernet card"				},
     { DEVICE_TYPE_NETWORK,	"le",		"DEC EtherWorks 2 or 3 ethernet card"				},
     { DEVICE_TYPE_NETWORK,	"lnc",		"Lance/PCnet (Isolan/Novell NE2100/NE32-VL) ethernet"		},
-    { DEVICE_TYPE_NETWORK,	"mx",		"Macronix 98713/98715/98725 PCI ethernet card"		},
-    { DEVICE_TYPE_NETWORK,	"pn",		"Lite-On 82168/82169 PNIC PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"rl",		"RealTek 8129/8139 PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"sf",		"Adaptec AIC-6915 PCI ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"sis",		"SiS 900/SiS 7016 PCI ethernet card"		},
diff --git a/release/texts/alpha/HARDWARE.TXT b/release/texts/alpha/HARDWARE.TXT
index aa4b8eb..c07bea0 100644
--- a/release/texts/alpha/HARDWARE.TXT
+++ b/release/texts/alpha/HARDWARE.TXT
@@ -85,11 +85,9 @@ sio1    2f8     3       n/a     n/a     Serial Port 1 (COM2)
 lpt0    dyn     7       n/a     n/a     Printer Port 0
 lpt1    dyn     dyn     n/a     n/a     Printer Port 1
 
-al0     dyn     dyn     n/a     dyn     ADMtek AL981/AN985 PCI based cards
-ax0     dyn     dyn     n/a     dyn     ASIX AX88140A PCI based cards
+dc0     n/a     n/a     n/a     n/a     DEC/Intel 21143 and workalikes
 de0     n/a     n/a     n/a     n/a     DEC DC21x40 PCI based cards
                                         (including 21140 100bT cards)
-dm0     n/a     n/a     n/a     n/a     Davicom DM9100/DM9102 PCI based cards
 ed0     280     10      dyn     d8000   WD & SMC 80xx; Novell NE1000 &
                                         NE2000; 3Com 3C503; HP PC Lan+
 eg0     310     5       dyn     dyn     3Com 3C505
@@ -106,8 +104,6 @@ le0     300     5       dyn     d0000   Digital Equipment EtherWorks
 lnc0    280     10      n/a     dyn     Lance/PCnet cards
                                         (Isolan, Novell NE2100, NE32-VL,
 					 some PCnet-PCI cards)
-mx0     dyn     dyn     n/a     dyn     Macronix 98713/15/25 PCI based cards
-pn0     dyn     dyn     n/a     dyn     Lite-On PNIC PCI based cards
 rl0     dyn     dyn     n/a     dyn     RealTek 8129/8139 fast ethernet
 sf0     dyn     dyn     n/a     dyn     Adaptec AIC-6915 fast ethernet
 sis0    dyn     dyn     n/a     dyn     SiS 900/SiS 7016 fast ethernet
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 5c0f802..350db50 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -120,6 +120,10 @@ Any usage of "/dev/sd*" in ``/etc/fstab'' must be replace by "/dev/da*".
 In addition, any useage of "/dev/*sd*" in scripts need to be changed.
 Even if you have old `sd' device entries in /dev, they will no longer work.
 
+The `al' `ax' `dm' `pn' and `mx' drivers have been removed and replaced
+with a single driver (`dc') in order to reduce code duplication. The
+new driver handles all chipsets supported by the older driver, and it
+offers improved support for 10/100 cards based on the DEC/Intel 21143.
 
 1.2. SECURITY FIXES
 -------------------
diff --git a/release/texts/i386/HARDWARE.TXT b/release/texts/i386/HARDWARE.TXT
index d477082..0ca490f 100644
--- a/release/texts/i386/HARDWARE.TXT
+++ b/release/texts/i386/HARDWARE.TXT
@@ -87,11 +87,9 @@ sio1    2f8     3       n/a     n/a     Serial Port 1 (COM2)
 
 ppc0    dyn     7       n/a     n/a     Printer ports
 
-al0     dyn     dyn     n/a     dyn     ADMtek AL981/AN985 PCI based cards
-ax0     dyn     dyn     n/a     dyn     ASIX AX88140A PCI based cards
+dc0     n/a     n/a     n/a     n/a     DEC/Intel 21143 cards and workalikes
 de0     n/a     n/a     n/a     n/a     DEC DC21x40 PCI based cards
                                         (including 21140 100bT cards)
-dm0     n/a     n/a     n/a     n/a     Davicom DM9100/DM9102 PCI based cards
 ed0     280     10      dyn     d8000   WD & SMC 80xx; Novell NE1000 &
                                         NE2000; 3Com 3C503; HP PC Lan+
 ep0     300     10      dyn     dyn     3Com 3C509
@@ -108,8 +106,6 @@ le0     300     5       dyn     d0000   Digital Equipment EtherWorks
 lnc0    280     10      n/a     dyn     Lance/PCnet cards
                                         (Isolan, Novell NE2100, NE32-VL,
 					 some PCnet-PCI cards)
-mx0     dyn     dyn     n/a     dyn     Macronix 98713/15/25 PCI based cards
-pn0     dyn     dyn     n/a     dyn     Lite-On PNIC PCI based cards
 rl0     dyn     dyn     n/a     dyn     RealTek 8129/8139 fast ethernet
 sf0     dyn     dyn     n/a     dyn     Adaptec AIC-6915 fast ethernet
 sis0    dyn     dyn     n/a     dyn     SiS 900/SiS 7016 fast ethernet
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index 816edc7..df3871f 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -122,6 +122,10 @@ Any usage of "/dev/sd*" in ``/etc/fstab'' must be replace by "/dev/da*".
 In addition, any useage of "/dev/*sd*" in scripts need to be changed.
 Even if you have old `sd' device entries in /dev, they will no longer work.
 
+The `al' `ax' `dm' `pn' and `mx' drivers have been removed and replaced
+with a single driver (`dc') in order to reduce code duplication. The
+new driver handles all chipsets supported by the older drivers, and it
+offers improved support for 10/100 cards based on the DEC/Intel 21143.
 
 1.2. SECURITY FIXES
 -------------------