diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-11-06 09:27:20 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-11-06 09:27:20 +0000 |
| commit | eb19df2972a79ae79ac1784d17976381f84e0bb0 (patch) | |
| tree | 4107d03a9f0d454e51e0f8893aaf90092a3fb45b /sys/dev | |
| parent | 0189c2b6b4561adb7cf817a2ee898989cad9e49c (diff) | |
move some macros from mii.h to miivar.h
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/mii/mii.h | 6 | ||||
| -rw-r--r-- | sys/dev/mii/miivar.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h index b41a5f98e88..ef41d561592 100644 --- a/sys/dev/mii/mii.h +++ b/sys/dev/mii/mii.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mii.h,v 1.9 2005/07/23 01:42:16 brad Exp $ */ +/* $OpenBSD: mii.h,v 1.10 2005/11/06 09:27:19 brad Exp $ */ /* $NetBSD: mii.h,v 1.8 2001/05/31 03:06:46 thorpej Exp $ */ /* @@ -108,10 +108,6 @@ #define IDR2_MODEL 0x03f0 /* vendor model */ #define IDR2_REV 0x000f /* vendor revision */ -#define MII_OUI(id1, id2) (((id1) << 6) | ((id2) >> 10)) -#define MII_MODEL(id2) (((id2) & IDR2_MODEL) >> 4) -#define MII_REV(id2) ((id2) & IDR2_REV) - #define MII_ANAR 0x04 /* Autonegotiation advertisement (rw) */ /* section 28.2.4.1 and 37.2.6.1 */ #define ANAR_NP 0x8000 /* Next page (ro) */ diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h index 990a6380906..8f986f05692 100644 --- a/sys/dev/mii/miivar.h +++ b/sys/dev/mii/miivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: miivar.h,v 1.25 2005/07/23 01:42:16 brad Exp $ */ +/* $OpenBSD: miivar.h,v 1.26 2005/11/06 09:27:19 brad Exp $ */ /* $NetBSD: miivar.h,v 1.17 2000/03/06 20:56:57 thorpej Exp $ */ /*- @@ -234,6 +234,10 @@ struct mii_media { #define mii_phy_probe(x, y, z) \ mii_attach((x), (y), (z), MII_PHY_ANY, MII_OFFSET_ANY, 0) +#define MII_OUI(id1, id2) (((id1) << 6) | ((id2) >> 10)) +#define MII_MODEL(id2) (((id2) & IDR2_MODEL) >> 4) +#define MII_REV(id2) ((id2) & IDR2_REV) + void mii_attach(struct device *, struct mii_data *, int, int, int, int); void mii_activate(struct mii_data *, enum devact, int, int); |