Deleted Added
full compact
ip1000phy.c (221747) ip1000phy.c (227842)
1/*-
2 * Copyright (c) 2006, Pyun YongHyeon <yongari@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
27 */
28
29#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2006, Pyun YongHyeon <yongari@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/dev/mii/ip1000phy.c 221747 2011-05-10 18:41:46Z marius $");
30__FBSDID("$FreeBSD: head/sys/dev/mii/ip1000phy.c 227842 2011-11-22 21:22:06Z yongari $");
31
32/*
33 * Driver for the IC Plus IP1000A/IP1001 10/100/1000 PHY.
34 */
35
36#include <sys/param.h>
37#include <sys/systm.h>
38#include <sys/kernel.h>

--- 280 unchanged lines hidden (view full) ---

319 }
320 reg |= IP1000PHY_ANAR_10T | IP1000PHY_ANAR_10T_FDX |
321 IP1000PHY_ANAR_100TX | IP1000PHY_ANAR_100TX_FDX;
322 if ((media & IFM_FLOW) != 0 || (sc->mii_flags & MIIF_FORCEPAUSE) != 0)
323 reg |= IP1000PHY_ANAR_PAUSE | IP1000PHY_ANAR_APAUSE;
324 PHY_WRITE(sc, IP1000PHY_MII_ANAR, reg | IP1000PHY_ANAR_CSMA);
325
326 reg = IP1000PHY_1000CR_1000T | IP1000PHY_1000CR_1000T_FDX;
31
32/*
33 * Driver for the IC Plus IP1000A/IP1001 10/100/1000 PHY.
34 */
35
36#include <sys/param.h>
37#include <sys/systm.h>
38#include <sys/kernel.h>

--- 280 unchanged lines hidden (view full) ---

319 }
320 reg |= IP1000PHY_ANAR_10T | IP1000PHY_ANAR_10T_FDX |
321 IP1000PHY_ANAR_100TX | IP1000PHY_ANAR_100TX_FDX;
322 if ((media & IFM_FLOW) != 0 || (sc->mii_flags & MIIF_FORCEPAUSE) != 0)
323 reg |= IP1000PHY_ANAR_PAUSE | IP1000PHY_ANAR_APAUSE;
324 PHY_WRITE(sc, IP1000PHY_MII_ANAR, reg | IP1000PHY_ANAR_CSMA);
325
326 reg = IP1000PHY_1000CR_1000T | IP1000PHY_1000CR_1000T_FDX;
327 reg |= IP1000PHY_1000CR_MASTER;
327 if (sc->mii_mpd_model != MII_MODEL_xxICPLUS_IP1001)
328 reg |= IP1000PHY_1000CR_MASTER;
328 PHY_WRITE(sc, IP1000PHY_MII_1000CR, reg);
329 PHY_WRITE(sc, IP1000PHY_MII_BMCR, (IP1000PHY_BMCR_FDX |
330 IP1000PHY_BMCR_AUTOEN | IP1000PHY_BMCR_STARTNEG));
331
332 return (EJUSTRETURN);
333}
334
335static void

--- 29 unchanged lines hidden ---
329 PHY_WRITE(sc, IP1000PHY_MII_1000CR, reg);
330 PHY_WRITE(sc, IP1000PHY_MII_BMCR, (IP1000PHY_BMCR_FDX |
331 IP1000PHY_BMCR_AUTOEN | IP1000PHY_BMCR_STARTNEG));
332
333 return (EJUSTRETURN);
334}
335
336static void

--- 29 unchanged lines hidden ---