diff options
| -rw-r--r-- | sys/dev/fxp/if_fxp.c | 14 | ||||
| -rw-r--r-- | sys/dev/fxp/if_fxpreg.h | 3 | ||||
| -rw-r--r-- | sys/pci/if_fxp.c | 14 | ||||
| -rw-r--r-- | sys/pci/if_fxpreg.h | 3 |
4 files changed, 30 insertions, 4 deletions
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index bd93465..03ae66b 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxp.c,v 1.48 1998/02/09 06:10:51 eivind Exp $ + * $Id: if_fxp.c,v 1.49 1998/02/20 13:11:53 bde Exp $ */ /* @@ -191,9 +191,18 @@ static const struct fxp_supported_media fxp_media[] = { { FXP_PHY_DP83840A, fxp_media_standard, sizeof(fxp_media_standard) / sizeof(fxp_media_standard[0]), FXP_MEDIA_STANDARD_DEFMEDIA }, + { FXP_PHY_82553A, fxp_media_standard, + sizeof(fxp_media_standard) / sizeof(fxp_media_standard[0]), + FXP_MEDIA_STANDARD_DEFMEDIA }, + { FXP_PHY_82553C, fxp_media_standard, + sizeof(fxp_media_standard) / sizeof(fxp_media_standard[0]), + FXP_MEDIA_STANDARD_DEFMEDIA }, { FXP_PHY_82555, fxp_media_standard, sizeof(fxp_media_standard) / sizeof(fxp_media_standard[0]), FXP_MEDIA_STANDARD_DEFMEDIA }, + { FXP_PHY_82555B, fxp_media_standard, + sizeof(fxp_media_standard) / sizeof(fxp_media_standard[0]), + FXP_MEDIA_STANDARD_DEFMEDIA }, { FXP_PHY_80C24, fxp_media_default, sizeof(fxp_media_default) / sizeof(fxp_media_default[0]), FXP_MEDIA_DEFAULT_DEFMEDIA }, @@ -1370,7 +1379,10 @@ fxp_set_media(sc, media) FXP_DP83840_PCR_F_CONNECT | /* force link disconnect bypass */ FXP_DP83840_PCR_BIT10); /* XXX I have no idea */ /* fall through */ + case FXP_PHY_82553A: + case FXP_PHY_82553C: /* untested */ case FXP_PHY_82555: + case FXP_PHY_82555B: if (IFM_SUBTYPE(media) != IFM_AUTO) { int flags; diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h index 58971bd..d391dd9 100644 --- a/sys/dev/fxp/if_fxpreg.h +++ b/sys/dev/fxp/if_fxpreg.h @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxpreg.h,v 1.10 1997/09/05 10:23:56 davidg Exp $ + * $Id: if_fxpreg.h,v 1.11 1997/09/29 11:27:42 davidg Exp $ */ #define FXP_VENDORID_INTEL 0x8086 @@ -327,6 +327,7 @@ struct fxp_stats { #define FXP_PHY_80C24 6 #define FXP_PHY_82555 7 #define FXP_PHY_DP83840A 10 +#define FXP_PHY_82555B 11 /* * PHY BMCR Basic Mode Control Register diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c index bd93465..03ae66b 100644 --- a/sys/pci/if_fxp.c +++ b/sys/pci/if_fxp.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxp.c,v 1.48 1998/02/09 06:10:51 eivind Exp $ + * $Id: if_fxp.c,v 1.49 1998/02/20 13:11:53 bde Exp $ */ /* @@ -191,9 +191,18 @@ static const struct fxp_supported_media fxp_media[] = { { FXP_PHY_DP83840A, fxp_media_standard, sizeof(fxp_media_standard) / sizeof(fxp_media_standard[0]), FXP_MEDIA_STANDARD_DEFMEDIA }, + { FXP_PHY_82553A, fxp_media_standard, + sizeof(fxp_media_standard) / sizeof(fxp_media_standard[0]), + FXP_MEDIA_STANDARD_DEFMEDIA }, + { FXP_PHY_82553C, fxp_media_standard, + sizeof(fxp_media_standard) / sizeof(fxp_media_standard[0]), + FXP_MEDIA_STANDARD_DEFMEDIA }, { FXP_PHY_82555, fxp_media_standard, sizeof(fxp_media_standard) / sizeof(fxp_media_standard[0]), FXP_MEDIA_STANDARD_DEFMEDIA }, + { FXP_PHY_82555B, fxp_media_standard, + sizeof(fxp_media_standard) / sizeof(fxp_media_standard[0]), + FXP_MEDIA_STANDARD_DEFMEDIA }, { FXP_PHY_80C24, fxp_media_default, sizeof(fxp_media_default) / sizeof(fxp_media_default[0]), FXP_MEDIA_DEFAULT_DEFMEDIA }, @@ -1370,7 +1379,10 @@ fxp_set_media(sc, media) FXP_DP83840_PCR_F_CONNECT | /* force link disconnect bypass */ FXP_DP83840_PCR_BIT10); /* XXX I have no idea */ /* fall through */ + case FXP_PHY_82553A: + case FXP_PHY_82553C: /* untested */ case FXP_PHY_82555: + case FXP_PHY_82555B: if (IFM_SUBTYPE(media) != IFM_AUTO) { int flags; diff --git a/sys/pci/if_fxpreg.h b/sys/pci/if_fxpreg.h index 58971bd..d391dd9 100644 --- a/sys/pci/if_fxpreg.h +++ b/sys/pci/if_fxpreg.h @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxpreg.h,v 1.10 1997/09/05 10:23:56 davidg Exp $ + * $Id: if_fxpreg.h,v 1.11 1997/09/29 11:27:42 davidg Exp $ */ #define FXP_VENDORID_INTEL 0x8086 @@ -327,6 +327,7 @@ struct fxp_stats { #define FXP_PHY_80C24 6 #define FXP_PHY_82555 7 #define FXP_PHY_DP83840A 10 +#define FXP_PHY_82555B 11 /* * PHY BMCR Basic Mode Control Register |
