diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 1999-07-16 14:59:08 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 1999-07-16 14:59:08 +0000 |
| commit | 0e5636a12a40a5904e9bb88ec8683a6a91eb98e0 (patch) | |
| tree | 79139316eab4e879279fa709452e905153b78c4e /sys/dev/mii/miivar.h | |
| parent | 9e2853823c92af3c3ed247622175ff75af176b46 (diff) | |
Sync with NetBSD:
o Implement asynchronous autonegotiation when driven by the MII tick
(one-second clock). Prevents .5s delays every 5 seconds when the interface
is up but there is no link.
o Correct the sense of the PCR_FLINK100 bit in nsphy.c.
Diffstat (limited to 'sys/dev/mii/miivar.h')
| -rw-r--r-- | sys/dev/mii/miivar.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h index be716d91b86..e084e861bde 100644 --- a/sys/dev/mii/miivar.h +++ b/sys/dev/mii/miivar.h @@ -1,8 +1,8 @@ -/* $OpenBSD: miivar.h,v 1.2 1998/11/11 19:34:48 jason Exp $ */ -/* $NetBSD: miivar.h,v 1.7 1998/11/05 04:08:02 thorpej Exp $ */ +/* $OpenBSD: miivar.h,v 1.3 1999/07/16 14:59:07 jason Exp $ */ +/* $NetBSD: miivar.h,v 1.7.6.1 1999/04/23 15:40:35 perry Exp $ */ /*- - * Copyright (c) 1998 The NetBSD Foundation, Inc. + * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -129,6 +129,7 @@ typedef struct mii_softc mii_softc_t; /* mii_flags */ #define MIIF_NOISOLATE 0x0001 /* do not isolate the PHY */ +#define MIIF_DOINGAUTO 0x0002 /* doing autonegotiation */ /* * Used to attach a PHY to a parent. @@ -161,7 +162,7 @@ void mii_add_media __P((struct mii_data *, int, int)); int mii_media_from_bmcr __P((int)); -int mii_phy_auto __P((struct mii_softc *)); +int mii_phy_auto __P((struct mii_softc *, int)); void mii_phy_reset __P((struct mii_softc *)); void ukphy_status __P((struct mii_softc *)); |