From owner-svn-src-head@FreeBSD.ORG  Thu Mar 12 06:35:01 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 11BD0106564A;
	Thu, 12 Mar 2009 06:35:01 +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 009D88FC1D;
	Thu, 12 Mar 2009 06:35:01 +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 n2C6Z0TH019474;
	Thu, 12 Mar 2009 06:35:00 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2C6Z0FA019473;
	Thu, 12 Mar 2009 06:35:00 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200903120635.n2C6Z0FA019473@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 12 Mar 2009 06:35:00 +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: r189726 - 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: Thu, 12 Mar 2009 06:35:01 -0000

Author: imp
Date: Thu Mar 12 06:35:00 2009
New Revision: 189726
URL: http://svn.freebsd.org/changeset/base/189726

Log:
  o writereg needs to return a vlue.
  o Add TJ PTJ-LAN_T card.  Some more work may be needed to make this
    actually function correctly.

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	Thu Mar 12 06:32:30 2009	(r189725)
+++ head/sys/dev/ed/if_ed_pccard.c	Thu Mar 12 06:35:00 2009	(r189726)
@@ -222,6 +222,7 @@ static const struct ed_product {
 	{ PCMCIA_CARD(TDK, DFL5610WS), 0},
 	{ PCMCIA_CARD(TELECOMDEVICE, LM5LT), 0 },
 	{ PCMCIA_CARD(TELECOMDEVICE, TCD_HPC100), NE2000DVF_AX88X90},
+	{ PCMCIA_CARD(TJ, PTJ_LAN_T), 0 },
 	{ PCMCIA_CARD(ZONET, ZEN), 0},
 	{ { NULL } }
 };
@@ -1017,7 +1018,7 @@ ed_miibus_readreg(device_t dev, int phy,
 	return (failed ? 0 : val);
 }
 
-static void
+static int
 ed_miibus_writereg(device_t dev, int phy, int reg, int data)
 {
 	struct ed_softc *sc;
@@ -1028,7 +1029,7 @@ ed_miibus_writereg(device_t dev, int phy
 	 * 0x11 through 0x1f.
 	 */
 	if (phy >= 0x11)
-		return;
+		return (0);
 
 	sc = device_get_softc(dev);
 	(*sc->mii_writebits)(sc, 0xffffffff, 32);
@@ -1039,6 +1040,7 @@ ed_miibus_writereg(device_t dev, int phy
 	(*sc->mii_writebits)(sc, ED_MII_TURNAROUND, ED_MII_TURNAROUND_BITS);
 	(*sc->mii_writebits)(sc, data, ED_MII_DATA_BITS);
 	(*sc->mii_writebits)(sc, ED_MII_IDLE, ED_MII_IDLE_BITS);
+	return (0);
 }
 
 static int