Author: marius
Date: Tue Nov 2 21:01:15 2010
New Revision: 214687
URL: http://svn.freebsd.org/changeset/base/214687
Log:
MFC: r201430
Fix card/device names, no functional change
The ADMtek AN985 is the cardbus variant of ADMtek AN983
The Netgear FA511 is just a relabled ADMtek AN985
PR: kern/50574
Modified:
stable/8/sys/dev/dc/if_dc.c
stable/8/sys/dev/dc/if_dcreg.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/dc/if_dc.c
==============================================================================
--- stable/8/sys/dev/dc/if_dc.c Tue Nov 2 20:16:41 2010 (r214686)
+++ stable/8/sys/dev/dc/if_dc.c Tue Nov 2 21:01:15 2010 (r214687)
@@ -43,8 +43,9 @@ __FBSDID("$FreeBSD$");
* ASIX Electronics AX88140A (www.asix.com.tw)
* ASIX Electronics AX88141 (www.asix.com.tw)
* ADMtek AL981 (www.admtek.com.tw)
- * ADMtek AN985 (www.admtek.com.tw)
- * Netgear FA511 (www.netgear.com) Appears to be rebadged ADMTek AN985
+ * ADMtek AN983 (www.admtek.com.tw)
+ * ADMtek cardbus AN985 (www.admtek.com.tw)
+ * Netgear FA511 (www.netgear.com) Appears to be rebadged ADMTek cardbus AN985
* Davicom DM9100, DM9102, DM9102A (www.davicom8.com)
* Accton EN1217 (www.accton.com)
* Xircom X3201 (www.xircom.com)
@@ -161,14 +162,14 @@ static const struct dc_type dc_devs[] =
"Davicom DM9102 10/100BaseTX" },
{ DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_AL981), 0,
"ADMtek AL981 10/100BaseTX" },
+ { DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_AN983), 0,
+ "ADMtek AN983 10/100BaseTX" },
{ DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_AN985), 0,
- "ADMtek AN985 10/100BaseTX" },
+ "ADMtek AN985 cardBus 10/100BaseTX or clone" },
{ DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_ADM9511), 0,
"ADMtek ADM9511 10/100BaseTX" },
{ DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_ADM9513), 0,
"ADMtek ADM9513 10/100BaseTX" },
- { DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_FA511), 0,
- "Netgear FA511 10/100BaseTX" },
{ DC_DEVID(DC_VENDORID_ASIX, DC_DEVICEID_AX88140A), DC_REVISION_88141,
"ASIX AX88141 10/100BaseTX" },
{ DC_DEVID(DC_VENDORID_ASIX, DC_DEVICEID_AX88140A), 0,
@@ -778,10 +779,10 @@ dc_miibus_readreg(device_t dev, int phy,
bzero(&frame, sizeof(frame));
/*
- * Note: both the AL981 and AN985 have internal PHYs,
+ * Note: both the AL981 and AN983 have internal PHYs,
* however the AL981 provides direct access to the PHY
- * registers while the AN985 uses a serial MII interface.
- * The AN985's MII interface is also buggy in that you
+ * registers while the AN983 uses a serial MII interface.
+ * The AN983's MII interface is also buggy in that you
* can read from any MII address (0 to 31), but only address 1
* behaves normally. To deal with both cases, we pretend
* that the PHY is at MII address 1.
@@ -1895,11 +1896,11 @@ dc_attach(device_t dev)
sc->dc_pmode = DC_PMODE_MII;
dc_read_srom(sc, sc->dc_romwidth);
break;
+ case DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_AN983):
case DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_AN985):
case DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_ADM9511):
case DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_ADM9513):
case DC_DEVID(DC_VENDORID_DLINK, DC_DEVICEID_DRP32TXD):
- case DC_DEVID(DC_VENDORID_ADMTEK, DC_DEVICEID_FA511):
case DC_DEVID(DC_VENDORID_ABOCOM, DC_DEVICEID_FE2500):
case DC_DEVID(DC_VENDORID_ABOCOM, DC_DEVICEID_FE2500MX):
case DC_DEVID(DC_VENDORID_ACCTON, DC_DEVICEID_EN2242):
@@ -1910,7 +1911,7 @@ dc_attach(device_t dev)
case DC_DEVID(DC_VENDORID_MICROSOFT, DC_DEVICEID_MSMN130):
case DC_DEVID(DC_VENDORID_LINKSYS, DC_DEVICEID_PCMPC200_AB08):
case DC_DEVID(DC_VENDORID_LINKSYS, DC_DEVICEID_PCMPC200_AB09):
- sc->dc_type = DC_TYPE_AN985;
+ sc->dc_type = DC_TYPE_AN983;
sc->dc_flags |= DC_64BIT_HASH;
sc->dc_flags |= DC_TX_USE_TX_INTR;
sc->dc_flags |= DC_TX_ADMTEK_WAR;
@@ -2057,7 +2058,7 @@ dc_attach(device_t dev)
dc_read_eeprom(sc, (caddr_t)&eaddr, DC_EE_NODEADDR, 3, 0);
break;
case DC_TYPE_AL981:
- case DC_TYPE_AN985:
+ case DC_TYPE_AN983:
reg = CSR_READ_4(sc, DC_AL_PAR0);
mac = (uint8_t *)&eaddr[0];
mac[0] = (reg >> 0) & 0xff;
Modified: stable/8/sys/dev/dc/if_dcreg.h
==============================================================================
--- stable/8/sys/dev/dc/if_dcreg.h Tue Nov 2 20:16:41 2010
(r214686)
+++ stable/8/sys/dev/dc/if_dcreg.h Tue Nov 2 21:01:15 2010
(r214687)
@@ -72,7 +72,7 @@
#define DC_TYPE_21143 0x4 /* Intel 21143 */
#define DC_TYPE_ASIX 0x5 /* ASIX AX88140A/AX88141 */
#define DC_TYPE_AL981 0x6 /* ADMtek AL981 Comet */
-#define DC_TYPE_AN985 0x7 /* ADMtek AN985 Centaur */
+#define DC_TYPE_AN983 0x7 /* ADMtek AN983 Centaur */
#define DC_TYPE_DM9102 0x8 /* Davicom DM9102 */
#define DC_TYPE_PNICII 0x9 /* 82c115 PNIC II */
#define DC_TYPE_PNIC 0xA /* 82c168/82c169 PNIC I */
@@ -86,12 +86,12 @@
#define DC_IS_ADMTEK(x) \
(x->dc_type == DC_TYPE_AL981 || \
- x->dc_type == DC_TYPE_AN985)
+ x->dc_type == DC_TYPE_AN983)
#define DC_IS_INTEL(x) (x->dc_type == DC_TYPE_21143)
#define DC_IS_ASIX(x) (x->dc_type == DC_TYPE_ASIX)
#define DC_IS_COMET(x) (x->dc_type == DC_TYPE_AL981)
-#define DC_IS_CENTAUR(x) (x->dc_type == DC_TYPE_AN985)
+#define DC_IS_CENTAUR(x) (x->dc_type == DC_TYPE_AN983)
#define DC_IS_DAVICOM(x) (x->dc_type == DC_TYPE_DM9102)
#define DC_IS_PNICII(x) (x->dc_type == DC_TYPE_PNICII)
#define DC_IS_PNIC(x) (x->dc_type == DC_TYPE_PNIC)
@@ -543,8 +543,8 @@ struct dc_mii_frame {
*/
/*
- * ADMtek specific registers and constants for the AL981 and AN985.
- * The AN985 doesn't use the magic PHY registers.
+ * ADMtek specific registers and constants for the AL981 and AN983.
+ * The AN983 doesn't use the magic PHY registers.
*/
#define DC_AL_CR 0x88 /* command register */
#define DC_AL_PAR0 0xA4 /* station address */
@@ -890,8 +890,8 @@ struct dc_softc {
* ADMtek device IDs.
*/
#define DC_DEVICEID_AL981 0x0981
-#define DC_DEVICEID_AN985 0x0985
-#define DC_DEVICEID_FA511 0x1985
+#define DC_DEVICEID_AN983 0x0985
+#define DC_DEVICEID_AN985 0x1985
#define DC_DEVICEID_ADM9511 0x9511
#define DC_DEVICEID_ADM9513 0x9513
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
