From owner-svn-src-head@FreeBSD.ORG  Tue Mar 31 01:59:47 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 57FB61065670;
	Tue, 31 Mar 2009 01:59:47 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 463738FC0C;
	Tue, 31 Mar 2009 01:59:47 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2V1xl1p084403;
	Tue, 31 Mar 2009 01:59:47 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2V1xlEZ084402;
	Tue, 31 Mar 2009 01:59:47 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200903310159.n2V1xlEZ084402@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 31 Mar 2009 01:59:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190583 - head/sys/dev/ed
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Mar 2009 01:59:47 -0000

Author: imp
Date: Tue Mar 31 01:59:47 2009
New Revision: 190583
URL: http://svn.freebsd.org/changeset/base/190583

Log:
  Hmmmm...  This can't be right...  But it looks like the DL100xx chips
  don't have one of the clock cycles (the turn cycle) that the AX88x90
  chips have.  Make this conditional.  But this seems totally crazy and
  can't possibly be right.  Commit the fix for the moment until I can
  explore this mystery more deeply.
  
  On the plus side, the DL10022-based cards I have (D-Link DEF-670TXD
  and SMC8040TX) work after this fix.

Modified:
  head/sys/dev/ed/if_ed_pccard.c

Modified: head/sys/dev/ed/if_ed_pccard.c
==============================================================================
--- head/sys/dev/ed/if_ed_pccard.c	Tue Mar 31 01:01:01 2009	(r190582)
+++ head/sys/dev/ed/if_ed_pccard.c	Tue Mar 31 01:59:47 2009	(r190583)
@@ -1115,7 +1115,9 @@ ed_miibus_readreg(device_t dev, int phy,
 	(*sc->mii_writebits)(sc, ED_MII_READOP, ED_MII_OP_BITS);
 	(*sc->mii_writebits)(sc, phy, ED_MII_PHY_BITS);
 	(*sc->mii_writebits)(sc, reg, ED_MII_REG_BITS);
-	(*sc->mii_readbits)(sc, ED_MII_ACK_BITS);
+	if (sc->chip_type == ED_CHIP_TYPE_AX88790 ||
+	    sc->chip_type == ED_CHIP_TYPE_AX88190)
+		(*sc->mii_readbits)(sc, ED_MII_ACK_BITS);
 	failed = (*sc->mii_readbits)(sc, ED_MII_ACK_BITS);
 	val = (*sc->mii_readbits)(sc, ED_MII_DATA_BITS);
 	(*sc->mii_writebits)(sc, ED_MII_IDLE, ED_MII_IDLE_BITS);