Deleted Added
full compact
ciphy.c (176773) ciphy.c (178598)
1/*-
2 * Copyright (c) 2004
3 * Bill Paul <wpaul@windriver.com>. 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

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

26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2004
3 * Bill Paul <wpaul@windriver.com>. 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

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

26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/dev/mii/ciphy.c 176773 2008-03-03 18:44:33Z raj $");
34__FBSDID("$FreeBSD: head/sys/dev/mii/ciphy.c 178598 2008-04-26 18:07:24Z raj $");
35
36/*
35
36/*
37 * Driver for the Cicada CS8201/CS8204 10/100/1000 copper PHY.
37 * Driver for the Cicada/Vitesse CS/VSC8xxx 10/100/1000 copper PHY.
38 */
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/module.h>
44#include <sys/socket.h>
45#include <sys/bus.h>

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

87static void ciphy_reset(struct mii_softc *);
88static void ciphy_fixup(struct mii_softc *);
89
90static const struct mii_phydesc ciphys[] = {
91 MII_PHY_DESC(CICADA, CS8201),
92 MII_PHY_DESC(CICADA, CS8201A),
93 MII_PHY_DESC(CICADA, CS8201B),
94 MII_PHY_DESC(CICADA, CS8204),
38 */
39
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/kernel.h>
43#include <sys/module.h>
44#include <sys/socket.h>
45#include <sys/bus.h>

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

87static void ciphy_reset(struct mii_softc *);
88static void ciphy_fixup(struct mii_softc *);
89
90static const struct mii_phydesc ciphys[] = {
91 MII_PHY_DESC(CICADA, CS8201),
92 MII_PHY_DESC(CICADA, CS8201A),
93 MII_PHY_DESC(CICADA, CS8201B),
94 MII_PHY_DESC(CICADA, CS8204),
95 MII_PHY_DESC(CICADA, CS8244),
95 MII_PHY_DESC(VITESSE, VSC8601),
96 MII_PHY_END
97};
98
99static int
100ciphy_probe(device_t dev)
101{
102

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

411 if ((speed == CIPHY_SPEED10 || speed == CIPHY_SPEED100) &&
412 (status & CIPHY_AUXCSR_FDX)) {
413 PHY_SETBIT(sc, CIPHY_MII_10BTCSR, CIPHY_10BTCSR_ECHO);
414 } else {
415 PHY_CLRBIT(sc, CIPHY_MII_10BTCSR, CIPHY_10BTCSR_ECHO);
416 }
417
418 break;
96 MII_PHY_DESC(VITESSE, VSC8601),
97 MII_PHY_END
98};
99
100static int
101ciphy_probe(device_t dev)
102{
103

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

412 if ((speed == CIPHY_SPEED10 || speed == CIPHY_SPEED100) &&
413 (status & CIPHY_AUXCSR_FDX)) {
414 PHY_SETBIT(sc, CIPHY_MII_10BTCSR, CIPHY_10BTCSR_ECHO);
415 } else {
416 PHY_CLRBIT(sc, CIPHY_MII_10BTCSR, CIPHY_10BTCSR_ECHO);
417 }
418
419 break;
420 case MII_MODEL_CICADA_CS8244:
419 case MII_MODEL_VITESSE_VSC8601:
420 break;
421 default:
422 device_printf(sc->mii_dev, "unknown CICADA PHY model %x\n",
423 model);
424 break;
425 }
426}
421 case MII_MODEL_VITESSE_VSC8601:
422 break;
423 default:
424 device_printf(sc->mii_dev, "unknown CICADA PHY model %x\n",
425 model);
426 break;
427 }
428}