diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-12-18 00:02:33 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-12-18 00:02:33 +0000 |
| commit | 4279f6f9aba2e8543260a762b4b2425a703eb4dc (patch) | |
| tree | dc1eb45c59aeb980a37b6894772f071ec33afae3 | |
| parent | da6809bfe334b33e9c52f3183576bd1f90f77b6f (diff) | |
if not a newer chip then print i82557, all fxp's attached to the ICH
chipsets are i82562.
| -rw-r--r-- | sys/dev/pci/if_fxp_pci.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c index e925b9e4952..38264d17fea 100644 --- a/sys/dev/pci/if_fxp_pci.c +++ b/sys/dev/pci/if_fxp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fxp_pci.c,v 1.41 2005/12/17 21:35:11 brad Exp $ */ +/* $OpenBSD: if_fxp_pci.c,v 1.42 2005/12/18 00:02:32 brad Exp $ */ /* * Copyright (c) 1995, David Greenman @@ -145,6 +145,7 @@ fxp_pci_attach(parent, self, aux) struct pci_attach_args *pa = aux; pci_chipset_tag_t pc = pa->pa_pc; pci_intr_handle_t ih; + const char *chipname = NULL; const char *intrstr = NULL; bus_size_t iosize; @@ -183,8 +184,7 @@ fxp_pci_attach(parent, self, aux) case PCI_PRODUCT_INTEL_82559: case PCI_PRODUCT_INTEL_82559ER: { - const char *chipname = NULL; - + chipname = "i82557"; if (sc->sc_revision >= FXP_REV_82558_A4) chipname = "i82558"; if (sc->sc_revision >= FXP_REV_82559_A0) @@ -195,17 +195,17 @@ fxp_pci_attach(parent, self, aux) chipname = "i82550"; if (sc->sc_revision >= FXP_REV_82551_E) chipname = "i82551"; - - if (chipname != NULL) - printf(", %s", chipname); - break; } break; default: + chipname = "i82562"; break; } + if (chipname != NULL) + printf(", %s", chipname); + /* * Cards for which we should WRITE TO THE EEPROM * to turn off dynamic standby mode to avoid |