From fgasper@operaman.ods.org  Thu Apr  3 12:13:58 2003
Return-Path: <fgasper@operaman.ods.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A998337B404
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  3 Apr 2003 12:13:58 -0800 (PST)
Received: from operaman.ods.org (12-251-205-107.client.attbi.com [12.251.205.107])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B984A43F75
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  3 Apr 2003 12:13:56 -0800 (PST)
	(envelope-from fgasper@operaman.ods.org)
Received: from operaman.ods.org (localhost [127.0.0.1])
	by operaman.ods.org (8.12.8p1/8.12.6) with ESMTP id h33KDti7041616
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 3 Apr 2003 14:13:55 -0600 (CST)
	(envelope-from fgasper@operaman.ods.org)
Received: (from fgasper@localhost)
	by operaman.ods.org (8.12.8p1/8.12.6/Submit) id h33KDs7P041615;
	Thu, 3 Apr 2003 14:13:54 -0600 (CST)
Message-Id: <200304032013.h33KDs7P041615@operaman.ods.org>
Date: Thu, 3 Apr 2003 14:13:54 -0600 (CST)
From: Felipe Gasper <fgasper@freeshell.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: dc driver incorrectly detects ADMtek chip model
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         50574
>Category:       kern
>Synopsis:       [dc] dc driver incorrectly detects ADMtek chip model
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    mbr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 03 12:20:03 PST 2003
>Closed-Date:    Sun Jan 03 14:01:54 UTC 2010
>Last-Modified:  Tue Nov  2 21:10:12 UTC 2010
>Originator:     Felipe
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
System: FreeBSD operaman.ods.org 4.8-RELEASE FreeBSD 4.8-RELEASE #4: Tue Apr 1 22:05:17 CST 2003 fgasper@operaman.ods.org:/usr/obj/usr/src/sys/CUSTOM i386


	
>Description:

I have a Linksys LNE-100TX v5.1 NIC. FBSD detects this card as using
an ADMtek AN985, but OpenBSD detects it as an AN983. Checking ADMtek's
site, the 985 is the mobile equivalent of the 983, from what I can
tell; the Linksys device must then have a 983 and not a 985.

>How-To-Repeat:

Install a Linksys LNE-100TX v5.1 card (or prob. any card that uses an
ADMtek 983) and dmesg.

>Fix:

I think it has to do w/ the 4-digit (?) ID string that the hardware
reports; I looked into this once by comparing the OpenBSD code with
the FreeBSD code. OBSD accomodates for a difference between the 983
and the 985.

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->imp 
Responsible-Changed-By: imp 
Responsible-Changed-When: Sat Apr 5 00:54:10 MST 2003 
Responsible-Changed-Why:  
I'll look into it. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=50574 
Responsible-Changed-From-To: imp->mbr 
Responsible-Changed-By: mbr 
Responsible-Changed-When: Fri Aug 29 02:03:37 PDT 2003 
Responsible-Changed-Why:  
I'm working on this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50574 
State-Changed-From-To: open->feedback 
State-Changed-By: mbr 
State-Changed-When: Sat Jan 2 22:51:34 UTC 2010 
State-Changed-Why:  
Is this issue still valid with later releases (say > 5.3)? Are you 
able to check your NIC with RELENG_6/7/8? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50574 

From: Felipe Gasper <fgasper@freeshell.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/50574: [dc] dc driver incorrectly detects ADMtek chip model
Date: Sat, 02 Jan 2010 21:46:38 -0600

 Oh wow....I haven’t used FBSD for about 6 years now. Couldn’t tell you.
 
 -F
 
 -- 
 Felipe M. L. Gasper
 http://felipegasper.com
 
 “Wisdom can never learn enough. Ignorance is sufficient unto itself.”
     -Mechtild of Magdeburg
 
 “Dad always thought laughter was the best medicine,
  which I guess is why several of us died of tuberculosis.”
     -Jack Handey

From: Martin Blapp <mblapp@attic.ch>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/50574: [dc] dc driver incorrectly detects ADMtek chip model
Date: Sun, 03 Jan 2010 14:03:48 +0100

 This is a multi-part message in MIME format.
 --------------020209010100080609080706
 Content-Type: text/plain; charset=ISO-8859-15; format=flowed
 Content-Transfer-Encoding: 7bit
 
 To fix the name mess I've prepared a patch. Since the AN985 is just
 the cardbus variant of AN983, I think the DC_IS_CENTAUR and
 DC_IS_ADMTEK defines should also be corrected. Beside this, there
 is no functional change.
 
 --
 Martin
 
 Index: if_dc.c
 ===================================================================
 --- if_dc.c    (revision 201400)
 +++ if_dc.c    (working copy)
 @@ -43,8 +43,9 @@
   * 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 @@
          "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 @@
      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 @@
          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 @@
      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,6 +2058,7 @@
          dc_read_eeprom(sc, (caddr_t)&eaddr, DC_EE_NODEADDR, 3, 0);
          break;
      case DC_TYPE_AL981:
 +    case DC_TYPE_AN983:
      case DC_TYPE_AN985:
          reg = CSR_READ_4(sc, DC_AL_PAR0);
          mac = (uint8_t *)&eaddr[0];
 Index: if_dcreg.h
 ===================================================================
 --- if_dcreg.h    (revision 201400)
 +++ if_dcreg.h    (working copy)
 @@ -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,16 @@
  
  #define DC_IS_ADMTEK(x)                \
      (x->dc_type == DC_TYPE_AL981 ||        \
 +     x->dc_type == DC_TYPE_AN983 ||        \
       x->dc_type == DC_TYPE_AN985)
  
 +#define DC_IS_CENTAUR(x)
 +    (x->dc_type == DC_TYPE_AN983 ||        \
 +     x->dc_type == DC_TYPE_AN985)
 +
  #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_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,7 +547,7 @@
   */
  
  /*
 - * ADMtek specific registers and constants for the AL981 and AN985.
 + * ADMtek specific registers and constants for the AL981 and AN983.
   * The AN985 doesn't use the magic PHY registers.
   */
  #define DC_AL_CR        0x88    /* command register */
 @@ -890,8 +894,8 @@
   * 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
  
 
 
 --------------020209010100080609080706
 Content-Type: text/plain;
  name="if_dc.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="if_dc.diff"
 
 Index: if_dc.c
 ===================================================================
 --- if_dc.c	(revision 201400)
 +++ if_dc.c	(working copy)
 @@ -43,8 +43,9 @@
   * 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 @@
  		"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 @@
  	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 @@
  		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 @@
  	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,6 +2058,7 @@
  		dc_read_eeprom(sc, (caddr_t)&eaddr, DC_EE_NODEADDR, 3, 0);
  		break;
  	case DC_TYPE_AL981:
 +	case DC_TYPE_AN983:
  	case DC_TYPE_AN985:
  		reg = CSR_READ_4(sc, DC_AL_PAR0);
  		mac = (uint8_t *)&eaddr[0];
 Index: if_dcreg.h
 ===================================================================
 --- if_dcreg.h	(revision 201400)
 +++ if_dcreg.h	(working copy)
 @@ -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,16 @@
  
  #define DC_IS_ADMTEK(x)				\
  	(x->dc_type == DC_TYPE_AL981 ||		\
 +	 x->dc_type == DC_TYPE_AN983 ||		\
  	 x->dc_type == DC_TYPE_AN985)
  
 +#define DC_IS_CENTAUR(x)
 +	(x->dc_type == DC_TYPE_AN983 ||		\
 +	 x->dc_type == DC_TYPE_AN985)
 +
  #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_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,7 +547,7 @@
   */
  
  /*
 - * ADMtek specific registers and constants for the AL981 and AN985.
 + * ADMtek specific registers and constants for the AL981 and AN983.
   * The AN985 doesn't use the magic PHY registers.
   */
  #define DC_AL_CR		0x88	/* command register */
 @@ -890,8 +894,8 @@
   * 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
  
 
 --------------020209010100080609080706--
State-Changed-From-To: feedback->closed 
State-Changed-By: mbr 
State-Changed-When: Sun Jan 3 14:01:04 UTC 2010 
State-Changed-Why:  
Fixed. Thank you. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50574 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/50574: commit references a PR
Date: Sun,  3 Jan 2010 14:00:20 +0000 (UTC)

 Author: mbr
 Date: Sun Jan  3 13:59:59 2010
 New Revision: 201430
 URL: http://svn.freebsd.org/changeset/base/201430
 
 Log:
   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
   MFC after:	1 month
 
 Modified:
   head/sys/dev/dc/if_dc.c
   head/sys/dev/dc/if_dcreg.h
 
 Modified: head/sys/dev/dc/if_dc.c
 ==============================================================================
 --- head/sys/dev/dc/if_dc.c	Sun Jan  3 13:48:58 2010	(r201429)
 +++ head/sys/dev/dc/if_dc.c	Sun Jan  3 13:59:59 2010	(r201430)
 @@ -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: head/sys/dev/dc/if_dcreg.h
 ==============================================================================
 --- head/sys/dev/dc/if_dcreg.h	Sun Jan  3 13:48:58 2010	(r201429)
 +++ head/sys/dev/dc/if_dcreg.h	Sun Jan  3 13:59:59 2010	(r201430)
 @@ -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
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/50574: commit references a PR
Date: Tue,  2 Nov 2010 21:01:25 +0000 (UTC)

 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
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/50574: commit references a PR
Date: Tue,  2 Nov 2010 21:01:26 +0000 (UTC)

 Author: marius
 Date: Tue Nov  2 21:01:18 2010
 New Revision: 214688
 URL: http://svn.freebsd.org/changeset/base/214688
 
 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/7/sys/dev/dc/if_dc.c
   stable/7/sys/dev/dc/if_dcreg.h
 Directory Properties:
   stable/7/sys/   (props changed)
   stable/7/sys/cddl/contrib/opensolaris/   (props changed)
   stable/7/sys/contrib/dev/acpica/   (props changed)
   stable/7/sys/contrib/pf/   (props changed)
 
 Modified: stable/7/sys/dev/dc/if_dc.c
 ==============================================================================
 --- stable/7/sys/dev/dc/if_dc.c	Tue Nov  2 21:01:15 2010	(r214687)
 +++ stable/7/sys/dev/dc/if_dc.c	Tue Nov  2 21:01:18 2010	(r214688)
 @@ -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,
 @@ -779,10 +780,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.
 @@ -1896,11 +1897,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):
 @@ -1911,7 +1912,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;
 @@ -2058,7 +2059,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/7/sys/dev/dc/if_dcreg.h
 ==============================================================================
 --- stable/7/sys/dev/dc/if_dcreg.h	Tue Nov  2 21:01:15 2010	(r214687)
 +++ stable/7/sys/dev/dc/if_dcreg.h	Tue Nov  2 21:01:18 2010	(r214688)
 @@ -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
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
