diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-01-16 19:46:02 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-01-16 19:46:02 +0000 |
| commit | ae5a53f7ba054194a9114f26996c38f15b8d1185 (patch) | |
| tree | e909f5998dc18e7ca2bd0d4d5455dd65f54002c1 /sys/dev/pci | |
| parent | bfe1398e83c40cd8f4a917f5c4eab1e0dd976386 (diff) | |
get EEPROM width on all cards except for the original PNIC
or XIRCOM cards.
Based on the FreeBSD dc(4) driver.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_dc_pci.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/sys/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c index 84053ad78ae..af21bf330c0 100644 --- a/sys/dev/pci/if_dc_pci.c +++ b/sys/dev/pci/if_dc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dc_pci.c,v 1.47 2005/01/14 15:04:52 brad Exp $ */ +/* $OpenBSD: if_dc_pci.c,v 1.48 2005/01/16 19:46:00 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -289,6 +289,11 @@ void dc_pci_attach(parent, self, aux) /* Need this info to decide on a chip type. */ sc->dc_revision = revision = PCI_REVISION(pa->pa_class); + /* Get the eeprom width, but PNIC has no eeprom */ + if (!(PCI_VENDOR(pa->pa_id) == PCI_VENDOR_LITEON && + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_LITEON_PNIC)) + dc_eeprom_width(sc); + switch (PCI_VENDOR(pa->pa_id)) { case PCI_VENDOR_DEC: if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_DEC_21140 || @@ -297,7 +302,6 @@ void dc_pci_attach(parent, self, aux) sc->dc_type = DC_TYPE_21143; sc->dc_flags |= DC_TX_POLL|DC_TX_USE_TX_INTR; sc->dc_flags |= DC_REDUCED_MII_POLL; - dc_eeprom_width(sc); dc_read_srom(sc, sc->dc_romwidth); } break; @@ -307,7 +311,6 @@ void dc_pci_attach(parent, self, aux) sc->dc_type = DC_TYPE_21145; sc->dc_flags |= DC_TX_POLL|DC_TX_USE_TX_INTR; sc->dc_flags |= DC_REDUCED_MII_POLL; - dc_eeprom_width(sc); dc_read_srom(sc, sc->dc_romwidth); } case PCI_VENDOR_DAVICOM: @@ -335,9 +338,8 @@ void dc_pci_attach(parent, self, aux) sc->dc_flags |= DC_TX_USE_TX_INTR; sc->dc_flags |= DC_TX_ADMTEK_WAR; sc->dc_pmode = DC_PMODE_MII; + /* Don't read SROM for - auto-loaded on reset */ } - dc_eeprom_width(sc); - dc_read_srom(sc, sc->dc_romwidth); break; case PCI_VENDOR_ADMTEK: if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ADMTEK_AL981) { @@ -346,7 +348,6 @@ void dc_pci_attach(parent, self, aux) sc->dc_flags |= DC_TX_USE_TX_INTR; sc->dc_flags |= DC_TX_ADMTEK_WAR; sc->dc_pmode = DC_PMODE_MII; - dc_eeprom_width(sc); dc_read_srom(sc, sc->dc_romwidth); } if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_ADMTEK_AN983) { @@ -356,7 +357,6 @@ void dc_pci_attach(parent, self, aux) sc->dc_flags |= DC_TX_ADMTEK_WAR; sc->dc_flags |= DC_64BIT_HASH; sc->dc_pmode = DC_PMODE_MII; - dc_eeprom_width(sc); /* Don't read SROM for - auto-loaded on reset */ } break; @@ -368,9 +368,7 @@ void dc_pci_attach(parent, self, aux) sc->dc_flags |= DC_TX_USE_TX_INTR; sc->dc_flags |= DC_TX_ADMTEK_WAR; sc->dc_pmode = DC_PMODE_MII; - - dc_eeprom_width(sc); - dc_read_srom(sc, sc->dc_romwidth); + /* Don't read SROM for - auto-loaded on reset */ } if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_MACRONIX_MX98713) { found = 1; @@ -450,7 +448,6 @@ void dc_pci_attach(parent, self, aux) sc->dc_flags |= DC_TX_INTR_ALWAYS; sc->dc_flags |= DC_REDUCED_MII_POLL; sc->dc_pmode = DC_PMODE_MII; - dc_eeprom_width(sc); dc_read_srom(sc, sc->dc_romwidth); } break; @@ -553,7 +550,6 @@ void dc_pci_attach(parent, self, aux) sc->dc_srm_media |= IFM_ACTIVE | IFM_ETHER; } #endif - dc_eeprom_width(sc); dc_attach(sc); fail: |