From owner-svn-src-all@FreeBSD.ORG  Tue Apr  7 15:44:50 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE8111065758;
	Tue,  7 Apr 2009 15:44:50 +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 DC9C38FC1C;
	Tue,  7 Apr 2009 15:44:50 +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 n37FioHh013139;
	Tue, 7 Apr 2009 15:44:50 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n37FiogZ013138;
	Tue, 7 Apr 2009 15:44:50 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200904071544.n37FiogZ013138@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 7 Apr 2009 15:44:50 +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: r190805 - head/sys/dev/ed
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Apr 2009 15:44:51 -0000

Author: imp
Date: Tue Apr  7 15:44:50 2009
New Revision: 190805
URL: http://svn.freebsd.org/changeset/base/190805

Log:
  Remove DL10019 workaround, since the code it calls isn't quite ready.

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 Apr  7 15:43:34 2009	(r190804)
+++ head/sys/dev/ed/if_ed_pccard.c	Tue Apr  7 15:44:50 2009	(r190805)
@@ -1196,14 +1196,15 @@ ed_pccard_tick(void *arg)
 		if (mii->mii_media_status & IFM_ACTIVE &&
 		    media != mii->mii_media_status) {
 			if (sc->chip_type == ED_CHIP_TYPE_DL10022) {
-				printf("Enabling 10022 workaround\n");
 				ed_asic_outb(sc, ED_DL10022_DIAG,
 				    (mii->mii_media_active & IFM_FDX) ?
 				    ED_DL10022_COLLISON_DIS : 0);
+#ifdef notyet
 			} else if (sc->chip_type == ED_CHIP_TYPE_DL10019) {
 				write_asic(sc, ED_DL10019_MAGIC,
 				    (mii->mii_media_active & IFM_FDX) ?
 				    DL19FDUPLX : 0);
+#endif
 			}
 		}