diff options
author | wpaul <wpaul@FreeBSD.org> | 1999-12-04 17:41:31 +0000 |
---|---|---|
committer | wpaul <wpaul@FreeBSD.org> | 1999-12-04 17:41:31 +0000 |
commit | cdd3a692fef117748428ae5f3c1c4991493348a0 (patch) | |
tree | c7c9beca143450e4c9418057e32fb311cb40b041 /sys/i386/conf | |
parent | 46e40e0c76b9170a8c1a4d7d1236f62a00b8fc19 (diff) | |
download | FreeBSD-src-cdd3a692fef117748428ae5f3c1c4991493348a0.zip FreeBSD-src-cdd3a692fef117748428ae5f3c1c4991493348a0.tar.gz |
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.
Diffstat (limited to 'sys/i386/conf')
-rw-r--r-- | sys/i386/conf/GENERIC | 6 | ||||
-rw-r--r-- | sys/i386/conf/LINT | 31 | ||||
-rw-r--r-- | sys/i386/conf/NEWCARD | 6 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 31 | ||||
-rw-r--r-- | sys/i386/conf/PCCARD | 6 |
5 files changed, 19 insertions, 61 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 9f6702e..dcdee22 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -175,18 +175,14 @@ device ppi0 # Parallel port interface device # PCI Ethernet NICs. -device ax0 # ASIX AX88140A device de0 # DEC/Intel DC21x4x (``Tulip'') device fxp0 # Intel EtherExpress PRO/100B (82557, 82558) -device pn0 # Lite-On 82c168/82c169 (``PNIC'') device tx0 # SMC 9432TX (83c170 ``EPIC'') device vx0 # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. controller miibus0 # MII bus support -device al0 # ADMtek AL981/AN985 (``Comet''/``Centaur'') -device dm0 # Davicom DM9100/DM9102 -device mx0 # Macronix 98713/98715/98725 (``PMAC'') +device dc0 # DEC/Intel 21143 and various workalikes device rl0 # RealTek 8129/8139 device sf0 # Adaptec AIC-6915 (``Starfire'') device sis0 # Silicon Integrated Systems SiS 900/SiS 7016 diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 70df1ae..c52b4c1 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -1646,31 +1646,20 @@ controller miibus0 # nd 1040B PCI SCSI host adapters, as well as the Qlogic ISP 2100 # FC/AL Host Adapter. # -# The `al' device provides support for PCI fast ethernet adapters -# based on the ADMtek Inc. AL981 "Comet" and the AN985 "Centaur" chips. -# -# The `ax' device provides support for PCI fast ethernet adapters -# based on the ASIX Electronics AX88140A chip, including the Alfa -# Inc. GFC2204. +# The `dc' device provides support for PCI fast ethernet adapters +# based on the DEC/Intel 21143 and various workalikes including: +# the ADMtek AL981 Comet and AN985 Centaur, the ASIX Electronics +# AX88140A and AX88141, the Davicom DM9100 and DM9102, the Lite-On +# 82c168 and 82c169 PNIC, the Lite-On/Macronix LC82C115 PNIC II +# and the Macronix 98713/98713A/98715/98715A/98725 PMAC. This driver +# replaces the old al, ax, dm, pn and mx drivers. # # The `de' device provides support for the Digital Equipment DC21040 # self-contained Ethernet adapter. # -# The `dm' device provides support for PCI fast ethernet adapters -# based on the the Davicom DM9100 and DM9102 controller chips, including -# the Jaton Corporation XPressNet. -# # The `fxp' device provides support for the Intel EtherExpress Pro/100B # PCI Fast Ethernet adapters. # -# The `mx' device provides support for various fast ethernet adapters -# based on the Macronix 98713, 987615 and 98725 series chips. -# -# The `pn' device provides support for various fast ethernet adapters -# based on the Lite-On 82c168 and 82c169 PNIC chips, including the -# LinkSys LNE100TX, the NetGear FA310TX rev. D1 and the Matrox -# FastNIC 10/100. -# # The 'rl' device provides support for PCI fast ethernet adapters based # on the RealTek 8129/8139 chipset. Note that the RealTek driver defaults # to using programmed I/O to do register accesses because memory mapped @@ -1852,13 +1841,9 @@ options SCSI_ISP_WWN="0x5000000099990000" #options ISP_COMPILE_2100_FW=1 #options ISP_COMPILE_2200_FW=1 -device al0 -device ax0 +device dc0 device de0 -device dm0 device fxp0 -device mx0 -device pn0 device rl0 device sf0 device sis0 diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD index 9f90731..bae4f12 100644 --- a/sys/i386/conf/NEWCARD +++ b/sys/i386/conf/NEWCARD @@ -169,13 +169,9 @@ device ppi0 # Parallel port interface device controller miibus0 # PCI Ethernet NICs. -device al0 # ADMtek AL981 (``Comet'') -device ax0 # ASIX AX88140A device de0 # DEC/Intel DC21x4x (``Tulip'') -device dm0 # Davicom DM9100/DM9102 +device dc0 # DEC/Intel 21143 and various workalikes device fxp0 # Intel EtherExpress PRO/100B (82557, 82558) -device mx0 # Macronix 98713/98715/98725 (``PMAC'') -device pn0 # Lite-On 82c168/82c169 (``PNIC'') device rl0 # RealTek 8129/8139 device sf0 # Adaptec AIC-6915 (``Starfire'') device sis0 # Silicon Integrated Systems SiS 900/SiS 7016 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 70df1ae..c52b4c1 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -1646,31 +1646,20 @@ controller miibus0 # nd 1040B PCI SCSI host adapters, as well as the Qlogic ISP 2100 # FC/AL Host Adapter. # -# The `al' device provides support for PCI fast ethernet adapters -# based on the ADMtek Inc. AL981 "Comet" and the AN985 "Centaur" chips. -# -# The `ax' device provides support for PCI fast ethernet adapters -# based on the ASIX Electronics AX88140A chip, including the Alfa -# Inc. GFC2204. +# The `dc' device provides support for PCI fast ethernet adapters +# based on the DEC/Intel 21143 and various workalikes including: +# the ADMtek AL981 Comet and AN985 Centaur, the ASIX Electronics +# AX88140A and AX88141, the Davicom DM9100 and DM9102, the Lite-On +# 82c168 and 82c169 PNIC, the Lite-On/Macronix LC82C115 PNIC II +# and the Macronix 98713/98713A/98715/98715A/98725 PMAC. This driver +# replaces the old al, ax, dm, pn and mx drivers. # # The `de' device provides support for the Digital Equipment DC21040 # self-contained Ethernet adapter. # -# The `dm' device provides support for PCI fast ethernet adapters -# based on the the Davicom DM9100 and DM9102 controller chips, including -# the Jaton Corporation XPressNet. -# # The `fxp' device provides support for the Intel EtherExpress Pro/100B # PCI Fast Ethernet adapters. # -# The `mx' device provides support for various fast ethernet adapters -# based on the Macronix 98713, 987615 and 98725 series chips. -# -# The `pn' device provides support for various fast ethernet adapters -# based on the Lite-On 82c168 and 82c169 PNIC chips, including the -# LinkSys LNE100TX, the NetGear FA310TX rev. D1 and the Matrox -# FastNIC 10/100. -# # The 'rl' device provides support for PCI fast ethernet adapters based # on the RealTek 8129/8139 chipset. Note that the RealTek driver defaults # to using programmed I/O to do register accesses because memory mapped @@ -1852,13 +1841,9 @@ options SCSI_ISP_WWN="0x5000000099990000" #options ISP_COMPILE_2100_FW=1 #options ISP_COMPILE_2200_FW=1 -device al0 -device ax0 +device dc0 device de0 -device dm0 device fxp0 -device mx0 -device pn0 device rl0 device sf0 device sis0 diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD index e783794..b8bb803 100644 --- a/sys/i386/conf/PCCARD +++ b/sys/i386/conf/PCCARD @@ -159,18 +159,14 @@ device ppi0 # Parallel port interface device # PCI Ethernet NICs. -device ax0 # ASIX AX88140A device de0 # DEC/Intel DC21x4x (``Tulip'') device fxp0 # Intel EtherExpress PRO/100B (82557, 82558) -device pn0 # Lite-On 82c168/82c169 (``PNIC'') device tx0 # SMC 9432TX (83c170 ``EPIC'') device vx0 # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. controller miibus0 # MII bus support -device al0 # ADMtek AL981/AN985 (``Comet''/``Centaur'') -device dm0 # Davicom DM9100/DM9102 -device mx0 # Macronix 98713/98715/98725 (``PMAC'') +device dc0 # DEC/Intrl 21143 and various workalikes device rl0 # RealTek 8129/8139 device sf0 # Adaptec AIC-6915 (``Starfire'') device sis0 # Silicon Integrated Systems SiS 900/SiS 7016 |