diff options
| author |   brad <brad@openbsd.org> | 2006-07-08 04:15:36 +0000 |
|---|---|---|
| committer | brad <brad@openbsd.org> | 2006-07-08 04:15:36 +0000 |
| commit | 8f825055ba9e1b024eec0bca21e24ac358581f91 (patch) | |
| tree | 0f4029973976a304f0d2fd3d634fff47b477af2f | |
| parent | shorten dmesg entry from two lines to one. (diff) | |
| download | wireguard-openbsd-8f825055ba9e1b024eec0bca21e24ac358581f91.tar.xz wireguard-openbsd-8f825055ba9e1b024eec0bca21e24ac358581f91.zip | |
print the chipset revision too.
| -rw-r--r-- | sys/dev/pci/if_de.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/if_devar.h | 24 |
2 files changed, 9 insertions, 25 deletions
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index 432d8a8b45f..3973edf19a4 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_de.c,v 1.95 2006/07/08 03:58:09 brad Exp $ */ +/* $OpenBSD: if_de.c,v 1.96 2006/07/08 04:15:36 brad Exp $ */ /* $NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $ */ /*- @@ -4678,11 +4678,7 @@ tulip_attach(struct device * const parent, struct device * const self, void * co if ((retval = tulip_read_macaddr(sc)) < 0) { printf(", %s%s pass %d.%d", sc->tulip_boardid, -#if defined(TULIP_DEBUG) tulip_chipdescs[sc->tulip_chipid], -#else - "", -#endif (sc->tulip_revinfo & 0xF0) >> 4, sc->tulip_revinfo & 0x0F); printf(": can't read ENET ROM (why=%d) (", retval); for (idx = 0; idx < 32; idx++) @@ -4716,11 +4712,7 @@ tulip_attach(struct device * const parent, struct device * const self, void * co printf(", %s%s pass %d.%d%s: %s, address %s\n", sc->tulip_boardid, -#if defined(TULIP_DEBUG) tulip_chipdescs[sc->tulip_chipid], -#else - "", -#endif (sc->tulip_revinfo & 0xF0) >> 4, sc->tulip_revinfo & 0x0F, (sc->tulip_features & (TULIP_HAVE_ISVSROM|TULIP_HAVE_OKSROM)) diff --git a/sys/dev/pci/if_devar.h b/sys/dev/pci/if_devar.h index 0fda63a060b..f85f3685b3c 100644 --- a/sys/dev/pci/if_devar.h +++ b/sys/dev/pci/if_devar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_devar.h,v 1.26 2006/05/31 02:45:42 brad Exp $ */ +/* $OpenBSD: if_devar.h,v 1.27 2006/07/08 04:15:36 brad Exp $ */ /* $NetBSD: if_devar.h,v 1.13 1997/06/08 18:46:36 thorpej Exp $ */ /*- @@ -38,8 +38,6 @@ bus_space_write_1((sc)->tulip_bustag, (sc)->tulip_bushandle, (sc)->tulip_csrs.csr, (val)) #ifdef TULIP_IOMAPPED -#define TULIP_EISA_CSRSIZE 16 -#define TULIP_EISA_CSROFFSET 0 #define TULIP_PCI_CSRSIZE 8 #define TULIP_PCI_CSROFFSET 0 #else /* TULIP_IOMAPPED */ @@ -616,22 +614,16 @@ struct _tulip_softc_t { #define TULIP_DO_AUTOSENSE(sc) (IFM_SUBTYPE((sc)->tulip_ifmedia.ifm_media) == IFM_AUTO) -#ifdef TULIP_DEBUG static const char * const tulip_chipdescs[] = { - "21040 [10Mb/s]", -#if defined(TULIP_EISA) - "DE425 [10Mb/s]", -#else + "21040", NULL, -#endif - "21041 [10Mb/s]", - "21140 [10-100Mb/s]", - "21140A [10-100Mb/s]", - "21142 [10-100Mb/s]", - "21143 [10-100Mb/s]", - "82C168 [10-100Mb/s]", + "21041", + "21140", + "21140A", + "21142", + "21143", + "82C168", }; -#endif #ifdef TULIP_DEBUG static const char * const tulip_mediums[] = { |