diff options
author | imp <imp@FreeBSD.org> | 2005-09-30 14:45:10 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2005-09-30 14:45:10 +0000 |
commit | 1bada7078492d10d93c240265cc4a80d92be91b8 (patch) | |
tree | d0194f61b7fb38f6e5ff8793427f38d3ddec1ba0 | |
parent | d2e8ad6a1665dd4d11638551b898c848b1722ef6 (diff) | |
download | FreeBSD-src-1bada7078492d10d93c240265cc4a80d92be91b8.zip FreeBSD-src-1bada7078492d10d93c240265cc4a80d92be91b8.tar.gz |
Add macros which follow the miidevs design pattern to make it easier
to construct tables for mii_phy_match.
-rw-r--r-- | sys/dev/mii/miivar.h | 3 | ||||
-rw-r--r-- | sys/dev/mii/nsgphy.c | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h index f6c759c..f1d16f7 100644 --- a/sys/dev/mii/miivar.h +++ b/sys/dev/mii/miivar.h @@ -161,6 +161,9 @@ struct mii_phydesc { u_int32_t mpd_model; /* the PHY's model */ const char *mpd_name; /* the PHY's name */ }; +#define MII_PHY_DESC(a, b) { MII_OUI_ ## a, MII_MODEL_ ## a ## _ ## b, \ + MII_STR_ ## a ## _ ## b } +#define MII_PHY_END { 0, 0, NULL } /* * An array of these structures map MII media types to BMCR/ANAR settings. diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c index 259739e..625b2e6 100644 --- a/sys/dev/mii/nsgphy.c +++ b/sys/dev/mii/nsgphy.c @@ -101,14 +101,9 @@ static int nsgphy_service(struct mii_softc *, struct mii_data *,int); static void nsgphy_status(struct mii_softc *); const struct mii_phydesc gphyters[] = { - { MII_OUI_NATSEMI, MII_MODEL_NATSEMI_DP83861, - MII_STR_NATSEMI_DP83861 }, - - { MII_OUI_NATSEMI, MII_MODEL_NATSEMI_DP83891, - MII_STR_NATSEMI_DP83891 }, - - { 0, 0, - NULL }, + MII_PHY_DESC(NATSEMI, DP83861), + MII_PHY_DESC(NATSEMI, DP83891), + MII_PHY_END }; static int |