Initial set of patches to get it to compile on >= 3.0. Most of the

changes relative to the 2.2 compatable version are include file
related, the new multicast interface (!) and the new PCI interface.

This should work "as-is" but has not been tested (I have not been able
to get a dc21x4x based card for testing).

1 files changed, 2972 insertions, 2413 deletions

diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 5fa2c73..e87c474 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1994, 1995, 1996 Matt Thomas (matt@3am-software.com)
+ * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_de.c,v 1.63 1997/03/24 11:33:44 bde Exp $
+ * $Id: if_de.c,v 1.86 1997/05/13 15:03:11 thomas Exp $
  *
  */
 
@@ -34,13 +34,18 @@
  *   This driver supports the DEC DE435 or any other PCI
  *   board which support 21040, 21041, or 21140 (mostly).
  */
+#define	TULIP_HDR_DATA
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
+#if defined(__FreeBSD__)
 #include <sys/sockio.h>
+#else
+#include <sys/ioctl.h>
+#endif
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
@@ -52,12 +57,19 @@
 #endif
 
 #include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_mib.h>
+#if defined(SIOCSIFMEDIA) && !defined(TULIP_NOIFMEDIA)
+#include <net/if_media.h>
+#endif
 #include <net/if_types.h>
+#include <net/if_dl.h>
 #include <net/route.h>
 #include <net/netisr.h>
 
+#if defined(__bsdi__) && _BSDI_VERSION >= 199701
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+#endif
+
 #include "bpfilter.h"
 #if NBPFILTER > 0
 #include <net/bpf.h>
@@ -69,7 +81,6 @@
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
-#include <netinet/if_ether.h>
 #endif
 
 #ifdef NS
@@ -83,20 +94,23 @@
 
 #if defined(__FreeBSD__)
 #include <vm/pmap.h>
-#include "pci.h"
+#include <pci.h>
+#include <netinet/if_ether.h>
 #if NPCI > 0
 #include <pci/pcivar.h>
-#include <pci/dc21040.h>
+#include <pci/dc21040reg.h>
+#define	DEVAR_INCLUDE	"pci/if_devar.h"
 #endif
 #endif /* __FreeBSD__ */
 
 #if defined(__bsdi__)
-#include <i386/pci/pci.h>
-#include <i386/pci/ic/dc21040.h>
+#include <netinet/if_ether.h>
+#include <i386/pci/ic/dc21040reg.h>
 #include <i386/isa/isa.h>
 #include <i386/isa/icu.h>
 #include <i386/isa/dma.h>
 #include <i386/isa/isavar.h>
+#include <i386/pci/pci.h>
 #if _BSDI_VERSION < 199510
 #include <eisa.h>
 #else
@@ -106,9 +120,14 @@
 #include <i386/eisa/eisa.h>
 #define	TULIP_EISA
 #endif
+#define	DEVAR_INCLUDE	"i386/pci/if_devar.h"
 #endif /* __bsdi__ */
 
 #if defined(__NetBSD__)
+#include <net/if_ether.h>
+#if defined(INET)
+#include <netinet/if_inarp.h>
+#endif
 #include <machine/bus.h>
 #if defined(__alpha__)
 #include <machine/intr.h>
@@ -116,6 +135,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/ic/dc21040reg.h>
+#define	DEVAR_INCLUDE	"dev/pci/if_devar.h"
 #endif /* __NetBSD__ */
 
 /*
@@ -137,1307 +157,1416 @@
 #define	TULIP_USE_SOFTINTR
 #endif
 
+#define	TULIP_HZ	10
+
+#include DEVAR_INCLUDE
 /*
  * This module supports
  *	the DEC 21040 PCI Ethernet Controller.
  *	the DEC 21041 PCI Ethernet Controller.
  *	the DEC 21140 PCI Fast Ethernet Controller.
  */
+static void tulip_mii_autonegotiate(tulip_softc_t * const sc, const unsigned phyaddr);
+static tulip_intrfunc_t tulip_intr_shared(void *arg);
+static tulip_intrfunc_t tulip_intr_normal(void *arg);
+static void tulip_init(tulip_softc_t * const sc);
+static void tulip_reset(tulip_softc_t * const sc);
+static ifnet_ret_t tulip_ifstart(struct ifnet *ifp);
+static void tulip_rx_intr(tulip_softc_t * const sc);
+static void tulip_addr_filter(tulip_softc_t * const sc);
+static unsigned tulip_mii_readreg(tulip_softc_t * const sc, unsigned devaddr, unsigned regno);
+static void tulip_mii_writereg(tulip_softc_t * const sc, unsigned devaddr, unsigned regno, unsigned data);
+static int tulip_mii_map_abilities(tulip_softc_t * const sc, unsigned abilities);
+static tulip_media_t tulip_mii_phy_readspecific(tulip_softc_t * const sc);
+static int tulip_srom_decode(tulip_softc_t * const sc);
+#if defined(IFM_ETHER)
+static int tulip_ifmedia_change(struct ifnet * const ifp);
+static void tulip_ifmedia_status(struct ifnet * const ifp, struct ifmediareq *req);
+#endif
+/* static void tulip_21140_map_media(tulip_softc_t *sc); */
+
+static void
+tulip_timeout_callback(
+    void *arg)
+{
+    tulip_softc_t * const sc = arg;
+    tulip_spl_t s = TULIP_RAISESPL();
 
-#ifdef TULIP_IOMAPPED
-#define	TULIP_EISA_CSRSIZE	16
-#define	TULIP_EISA_CSROFFSET	0
-#define	TULIP_PCI_CSRSIZE	8
-#define	TULIP_PCI_CSROFFSET	0
-
-#if defined(__NetBSD__)
-typedef bus_io_size_t tulip_csrptr_t;
-
-#define TULIP_CSR_READ(sc, csr) \
-    bus_io_read_4((sc)->tulip_bc, (sc)->tulip_ioh, (sc)->tulip_csrs.csr)
-#define TULIP_CSR_WRITE(sc, csr, val) \
-    bus_io_write_4((sc)->tulip_bc, (sc)->tulip_ioh, (sc)->tulip_csrs.csr, (val))
-
-#define TULIP_CSR_READBYTE(sc, csr) \
-    bus_io_read_1((sc)->tulip_bc, (sc)->tulip_ioh, (sc)->tulip_csrs.csr)
-#define TULIP_CSR_WRITEBYTE(sc, csr, val) \
-    bus_io_write_1((sc)->tulip_bc, (sc)->tulip_ioh, (sc)->tulip_csrs.csr, (val))
-#else
-typedef u_int16_t tulip_csrptr_t;
-
-#define	TULIP_CSR_READ(sc, csr)			(inl((sc)->tulip_csrs.csr))
-#define	TULIP_CSR_WRITE(sc, csr, val)   	outl((sc)->tulip_csrs.csr, val)
-
-#define	TULIP_CSR_READBYTE(sc, csr)		(inb((sc)->tulip_csrs.csr))
-#define	TULIP_CSR_WRITEBYTE(sc, csr, val)	outb((sc)->tulip_csrs.csr, val)
-#endif /* __NetBSD__ */
-
-#else /* TULIP_IOMAPPED */
-
-#define	TULIP_PCI_CSRSIZE	8
-#define	TULIP_PCI_CSROFFSET	0
-
-#if defined(__NetBSD__)
-typedef bus_mem_size_t tulip_csrptr_t;
-
-#define TULIP_CSR_READ(sc, csr) \
-    bus_mem_read_4((sc)->tulip_bc, (sc)->tulip_memh, (sc)->tulip_csrs.csr)
-#define TULIP_CSR_WRITE(sc, csr, val) \
-    bus_mem_write_4((sc)->tulip_bc, (sc)->tulip_memh, (sc)->tulip_csrs.csr, \
-      (val))
-#else
-typedef volatile u_int32_t *tulip_csrptr_t;
-
-/*
- * macros to read and write CSRs.  Note that the "0 +" in
- * READ_CSR is to prevent the macro from being an lvalue
- * and WRITE_CSR shouldn't be assigned from.
- */
-#define	TULIP_CSR_READ(sc, csr)		(0 + *(sc)->tulip_csrs.csr)
-#define	TULIP_CSR_WRITE(sc, csr, val)	((void)(*(sc)->tulip_csrs.csr = (val)))
-#endif /* __NetBSD__ */
-
-#endif /* TULIP_IOMAPPED */
-
-/*
- * This structure contains "pointers" for the registers on
- * the various 21x4x chips.  CSR0 through CSR8 are common
- * to all chips.  After that, it gets messy...
- */
-typedef struct {
-    tulip_csrptr_t csr_busmode;			/* CSR0 */
-    tulip_csrptr_t csr_txpoll;			/* CSR1 */
-    tulip_csrptr_t csr_rxpoll;			/* CSR2 */
-    tulip_csrptr_t csr_rxlist;			/* CSR3 */
-    tulip_csrptr_t csr_txlist;			/* CSR4 */
-    tulip_csrptr_t csr_status;			/* CSR5 */
-    tulip_csrptr_t csr_command;			/* CSR6 */
-    tulip_csrptr_t csr_intr;			/* CSR7 */
-    tulip_csrptr_t csr_missed_frames;		/* CSR8 */
-
-    /* 21040 specific registers */
-
-    tulip_csrptr_t csr_enetrom;			/* CSR9 */
-    tulip_csrptr_t csr_reserved;		/* CSR10 */
-    tulip_csrptr_t csr_full_duplex;		/* CSR11 */
-
-    /* 21040/21041 common registers */
-
-    tulip_csrptr_t csr_sia_status;		/* CSR12 */
-    tulip_csrptr_t csr_sia_connectivity;	/* CSR13 */
-    tulip_csrptr_t csr_sia_tx_rx;		/* CSR14 */
-    tulip_csrptr_t csr_sia_general;		/* CSR15 */
-
-    /* 21140/21041 common registers */
-
-    tulip_csrptr_t csr_srom_mii;		/* CSR9 */
-    tulip_csrptr_t csr_gp_timer;		/* CSR11 */
-
-    /* 21140 specific registers */
-
-    tulip_csrptr_t csr_gp;			/* CSR12 */
-    tulip_csrptr_t csr_watchdog;		/* CSR15 */
-
-    /* 21041 specific registers */
+    sc->tulip_flags &= ~TULIP_TIMEOUTPENDING;
+    sc->tulip_probe_timeout -= 1000 / TULIP_HZ;
+    (sc->tulip_boardsw->bd_media_poll)(sc, TULIP_MEDIAPOLL_TIMER);
+    TULIP_RESTORESPL(s);
+}
 
-    tulip_csrptr_t csr_bootrom;			/* CSR10 */
-} tulip_regfile_t;
+static void
+tulip_timeout(
+    tulip_softc_t * const sc)
+{
+    if (sc->tulip_flags & TULIP_TIMEOUTPENDING)
+	return;
+    sc->tulip_flags |= TULIP_TIMEOUTPENDING;
+    timeout(tulip_timeout_callback, sc, (hz + TULIP_HZ / 2) / TULIP_HZ);
+}
 
-/*
- * While 21x4x allows chaining of its descriptors, this driver
- * doesn't take advantage of it.  We keep the descriptors in a
- * traditional FIFO ring.  
- */
-typedef struct {
-    tulip_desc_t *ri_first;	/* first entry in ring */
-    tulip_desc_t *ri_last;	/* one after last entry */
-    tulip_desc_t *ri_nextin;	/* next to processed by host */
-    tulip_desc_t *ri_nextout;	/* next to processed by adapter */
-    int ri_max;
-    int ri_free;
-} tulip_ringinfo_t;
+#if defined(TULIP_NEED_FASTTIMEOUT)
+static void
+tulip_fasttimeout_callback(
+    void *arg)
+{
+    tulip_softc_t * const sc = arg;
+    tulip_spl_t s = TULIP_RAISESPL();
 
-/*
- * The 21040 has a stupid restriction in that the receive
- * buffers must be longword aligned.  But since Ethernet
- * headers are not a multiple of longwords in size this forces
- * the data to non-longword aligned.  Since IP requires the
- * data to be longword aligned, we need to copy it after it has
- * been DMA'ed in our memory.
- *
- * Since we have to copy it anyways, we might as well as allocate
- * dedicated receive space for the input.  This allows to use a
- * small receive buffer size and more ring entries to be able to
- * better keep with a flood of tiny Ethernet packets.
- *
- * The receive space MUST ALWAYS be a multiple of the page size.
- * And the number of receive descriptors multiplied by the size
- * of the receive buffers must equal the recevive space.  This
- * is so that we can manipulate the page tables so that even if a
- * packet wraps around the end of the receive space, we can 
- * treat it as virtually contiguous.
- *
- * The above used to be true (the stupid restriction is still true)
- * but we gone to directly DMA'ing into MBUFs (unless it's on an 
- * architecture which can't handle unaligned accesses) because with
- * 100Mb/s cards the copying is just too much of a hit.
- */
-#if defined(__alpha__)
-#define	TULIP_COPY_RXDATA	1
-#endif
+    sc->tulip_flags &= ~TULIP_FASTTIMEOUTPENDING;
+    (sc->tulip_boardsw->bd_media_poll)(sc, TULIP_MEDIAPOLL_FASTTIMER);
+    TULIP_RESTORESPL(s);
+}
 
-#define	TULIP_TXTIMER		3
-#define	TULIP_RXDESCS		48
-#define	TULIP_TXDESCS		128
-#define	TULIP_RXQ_TARGET	32
-#if TULIP_RXQ_TARGET >= TULIP_RXDESCS
-#error TULIP_RXQ_TARGET must be less than TULIP_RXDESCS
+static void
+tulip_fasttimeout(
+    tulip_softc_t * const sc)
+{
+    if (sc->tulip_flags & TULIP_FASTTIMEOUTPENDING)
+	return;
+    sc->tulip_flags |= TULIP_FASTTIMEOUTPENDING;
+    timeout(tulip_fasttimeout_callback, sc, 1);
+}
 #endif
-#define	TULIP_RX_BUFLEN		((MCLBYTES < 2048 ? MCLBYTES : 2048) - 16)
-
-/*
- * Forward reference to make C happy.
- */
-typedef struct _tulip_softc_t tulip_softc_t;
-
-/*
- * The various controllers support.  Technically the DE425 is just
- * a 21040 on EISA.  But since it remarkably difference from normal
- * 21040s, we give it its own chip id.
- */
-
-typedef enum {
-    TULIP_21040, TULIP_DE425,
-    TULIP_21041,
-    TULIP_21140, TULIP_21140A, TULIP_21142,
-    TULIP_21143,
-    TULIP_CHIPID_UNKNOWN
-} tulip_chipid_t;
-
-/*
- * Various physical media types supported.
- * BNCAUI is BNC or AUI since on the 21040 you can't really tell
- * which is in use.
- */
-typedef enum {
-    TULIP_MEDIA_UNKNOWN,
-    TULIP_MEDIA_10BASET,
-    TULIP_MEDIA_BNC,
-    TULIP_MEDIA_AUI,
-    TULIP_MEDIA_BNCAUI,
-    TULIP_MEDIA_10BASET_FD,
-    TULIP_MEDIA_100BASETX,
-    TULIP_MEDIA_100BASETX_FD,
-    TULIP_MEDIA_100BASET4,
-    TULIP_MEDIA_100BASEFX,
-    TULIP_MEDIA_100BASEFX_FD,
-    TULIP_MEDIA_MAX
-} tulip_media_t;
-
-/*
- * Some boards need to treated specially.  The following enumeration
- * identifies the cards with quirks (or those we just want to single
- * out for special merit or scorn).
- */
-typedef enum {
-    TULIP_21040_GENERIC,		/* Generic 21040 (works with most any board) */
-    TULIP_21040_ZX314_MASTER,		/* ZNYX ZX314 Master 21040 (it has the interrupt line) */
-    TULIP_21040_ZX314_SLAVE,		/* ZNYX ZX314 Slave 21040 (its interrupt is tied to the master's */
-    TULIP_21140_DEC_EB,			/* Digital Semicondutor 21140 Evaluation Board */
-    TULIP_21140_DEC_DE500,		/* Digital DE500-?? 10/100 */
-    TULIP_21140_SMC_9332,		/* SMC 9332 */
-    TULIP_21140A_SMC_9332BDT,		/* SMC 9332BDT with 21140A */
-    TULIP_21140_COGENT_EM100,		/* Cogent EM100 100 only */
-    TULIP_21140_ZNYX_ZX34X,		/* ZNYX ZX342 10/100 */
-    TULIP_21041_GENERIC,		/* Generic 21041 card */
-    TULIP_21041_DEC_DE450		/* Digital DE450 */
-} tulip_board_t;
-
-/*
- * This data structure is used to abstract out the quirks.
- * media_probe  = tries to determine the media type.
- * media_select = enables the current media (or autosenses)
- * media_preset = 21140, etal requires bit to set before the
- *		  the software reset; hence pre-set.  Should be
- *		  pre-reset but that's ugly.
- * mii_probe	= probe for PHY devices connected via the MII interface
- *		  on 21140, etal.
- */
-
-typedef struct {
-    tulip_board_t bd_type;
-    const char *bd_description;
-    int (*bd_media_probe)(tulip_softc_t *sc);
-    void (*bd_media_select)(tulip_softc_t *sc);
-    void (*bd_media_preset)(tulip_softc_t *sc);
-    void (*bd_mii_probe)(tulip_softc_t *sc);
-} tulip_boardsw_t;
-
-/*
- * The next few declarations are for MII/PHY based board.
- *
- *    The first enumeration identifies a superset of various datums
- * that can be obtained from various PHY chips.  Not all PHYs will
- * support all datums.
- *    The modedata structure indicates what register contains
- * a datum, what mask is applied the register contents, and what the
- * result should be.
- *    The attr structure records information about a supported PHY.
- *    The phy structure records information about a PHY instance.
- */
-
-typedef enum {
-    PHY_MODE_10T,
-    PHY_MODE_100TX,
-    PHY_MODE_100T4,
-    PHY_MODE_FULLDUPLEX,
-    PHY_MODE_MAX
-} phy_mode_t;
-
-typedef struct {
-    unsigned short pm_regno;
-    unsigned short pm_mask;
-    unsigned short pm_value;
-} phy_modedata_t;
-
-typedef struct {
-    const char *attr_name;
-    unsigned attr_id;
-    unsigned short attr_flags;
-#define	PHY_NEED_HARD_RESET	0x0001
-#define	PHY_DUAL_CYCLE_TA	0x0002
-    phy_modedata_t attr_modes[PHY_MODE_MAX];
-} phy_attr_t;
-
-typedef struct _tulip_phy_t {
-    const struct _tulip_phy_t *phy_next;
-    const phy_attr_t *phy_attr;
-    unsigned phy_devaddr;
-    unsigned phy_status;
-} tulip_phy_t;
-
-/*
- * Various probe states used when trying to autosense the media.
- * While we could try to autosense on the 21040, it a pain and so
- * until someone complain we won't.  However, the 21041 and MII
- * 2114x do support autosense.
- */
-
-typedef enum {
-    TULIP_PROBE_INACTIVE, TULIP_PROBE_10BASET, TULIP_PROBE_AUI,
-    TULIP_PROBE_BNC, TULIP_PROBE_PHYRESET, TULIP_PROBE_PHYAUTONEG,
-    TULIP_PROBE_MEDIATEST, TULIP_PROBE_FAILED
-} tulip_probe_state_t;
-
-typedef struct {
+
+static int
+tulip_txprobe(
+    tulip_softc_t * const sc)
+{
+    struct mbuf *m;
     /*
-     * Transmit Statistics
+     * Before we are sure this is the right media we need
+     * to send a small packet to make sure there's carrier.
+     * Strangely, BNC and AUI will 'see" receive data if
+     * either is connected so the transmit is the only way
+     * to verify the connectivity.
      */
-    u_int32_t dot3StatsSingleCollisionFrames;
-    u_int32_t dot3StatsMultipleCollisionFrames;
-    u_int32_t dot3StatsSQETestErrors;
-    u_int32_t dot3StatsDeferredTransmissions;
-    u_int32_t dot3StatsLateCollisions;
-    u_int32_t dot3StatsExcessiveCollisions;
-    u_int32_t dot3StatsInternalMacTransmitErrors;
-    u_int32_t dot3StatsCarrierSenseErrors;
+    MGETHDR(m, M_DONTWAIT, MT_DATA);
+    if (m == NULL)
+	return 0;
     /*
-     * Receive Statistics
+     * Construct a LLC TEST message which will point to ourselves.
      */
-    u_int32_t dot3StatsMissedFrames;	/* not in rfc1650! */
-    u_int32_t dot3StatsAlignmentErrors;
-    u_int32_t dot3StatsFCSErrors;
-    u_int32_t dot3StatsFrameTooLongs;
-    u_int32_t dot3StatsInternalMacReceiveErrors;
-} tulip_dot3_stats_t;
-
-/*
- * Now to important stuff.  This is softc structure (where does softc
- * come from??? No idea) for the tulip device.  
- *
- */
-struct _tulip_softc_t {
-#if defined(__bsdi__)
-    struct device tulip_dev;		/* base device */
-    struct isadev tulip_id;		/* ISA device */
-    struct intrhand tulip_ih;		/* intrrupt vectoring */
-    struct atshutdown tulip_ats;	/* shutdown hook */
-#if _BSDI_VERSION < 199401
-    caddr_t tulip_bpf;			/* for BPF */
-#else
-    prf_t tulip_pf;			/* printf function */
-#endif
-#endif
-#if defined(__NetBSD__)
-    struct device tulip_dev;		/* base device */
-    void *tulip_ih;			/* intrrupt vectoring */
-    void *tulip_ats;			/* shutdown hook */
-    bus_chipset_tag_t tulip_bc;
-    pci_chipset_tag_t tulip_pc;
-#ifdef TULIP_IOMAPPED
-    bus_io_handle_t tulip_ioh;		/* I/O region handle */
-#else
-    bus_io_handle_t tulip_memh;		/* memory region handle */
-#endif
-#endif
-    struct arpcom tulip_ac;
-    tulip_regfile_t tulip_csrs;
-    unsigned tulip_flags;
-#define	TULIP_WANTSETUP		0x00000001
-#define	TULIP_WANTHASH		0x00000002
-#define	TULIP_DOINGSETUP	0x00000004
-#define	TULIP_ALTPHYS		0x00000008
-#define	TULIP_PRINTMEDIA	0x00000010
-#define	TULIP_TXPROBE_ACTIVE	0x00000020
-#define	TULIP_TXPROBE_OK	0x00000040
-#define	TULIP_WANTRXACT		0x00000080
-#define	TULIP_RXACT		0x00000100
-#define	TULIP_INRESET		0x00000200
-#define	TULIP_NEEDRESET		0x00000400
-#define	TULIP_SQETEST		0x00000800
-#define	TULIP_ROMOK		0x00001000
-#define	TULIP_SLAVEDROM		0x00002000
-#define	TULIP_SLAVEDINTR	0x00004000
-#define	TULIP_SHAREDINTR	0x00008000
-#define	TULIP_LINKSUSPECT	0x00010000
-#define	TULIP_LINKUP		0x00020000
-#define	TULIP_RXBUFSLOW		0x00040000
-#define	TULIP_NOMESSAGES	0x00080000
-#define	TULIP_SYSTEMERROR	0x00100000
-#define	TULIP_DEVICEPROBE	0x00200000
-#define	TULIP_FAKEGPTIMEOUT	0x00400000
-    /* only 10 bits! */
-    unsigned char tulip_rombuf[128];
-    u_int32_t tulip_setupbuf[192/sizeof(u_int32_t)];
-    u_int32_t tulip_setupdata[192/sizeof(u_int32_t)];
-    u_int32_t tulip_intrmask;	/* our copy of csr_intr */
-    u_int32_t tulip_cmdmode;	/* our copy of csr_cmdmode */
-    u_int32_t tulip_revinfo;	/* revision of chip */
-    u_int32_t tulip_gpticks;	/* number of gpticks unless timeout */
-    u_int32_t tulip_last_system_error : 3;	/* last system error (only value is TULIP_SYSTEMERROR is also set) */
-    u_int32_t tulip_txtimer : 2;	/* transmission timer */
-    u_int32_t tulip_system_errors;	/* number of system errors encountered */
-    u_int32_t tulip_statusbits;	/* status bits from CSR5 that may need to be printed */
-    u_int32_t tulip_abilities;	/* remote system's abiltities (as defined in IEEE 802.3u) */
-    /* u_int32_t tulip_bus; XXX */
-    tulip_media_t tulip_media;		/* current media type */
-    tulip_probe_state_t tulip_probe_state;	/* current media probe state */
-    tulip_chipid_t tulip_chipid;	/* type of chip we are using */
-    const char *tulip_boardid;		/* string for board ID */
-    char tulip_boardidbuf[16];		/* buffer for board ID */
-    const tulip_boardsw_t *tulip_boardsw; /* board/chip characteristics */
-    tulip_softc_t *tulip_slaves;	/* slaved devices (ZX3xx) */
-    tulip_phy_t *tulip_phys;		/* 802.3 PHY devices */
-#if defined(TULIP_DEBUG)
+    bcopy(sc->tulip_enaddr, mtod(m, struct ether_header *)->ether_dhost, 6);
+    bcopy(sc->tulip_enaddr, mtod(m, struct ether_header *)->ether_shost, 6);
+    mtod(m, struct ether_header *)->ether_type = htons(3);
+    mtod(m, unsigned char *)[14] = 0;
+    mtod(m, unsigned char *)[15] = 0;
+    mtod(m, unsigned char *)[16] = 0xE3;	/* LLC Class1 TEST (no poll) */
+    m->m_len = m->m_pkthdr.len = sizeof(struct ether_header) + 3;
     /*
-     * Debugging/Statistical information
+     * send it!
      */
-    struct {
-	u_int32_t dbg_intrs;
-	u_int32_t dbg_msdelay;
-	u_int32_t dbg_gpticks;
-	enum {
-	    TULIP_GPTMR_10MB,
-	    TULIP_GPTMR_10MB_MII,
-	    TULIP_GPTMR_100MB_MII
-	} dbg_gprate;
-	u_int32_t dbg_gpintrs;
-	u_int32_t dbg_gpintrs_hz;
-	u_int32_t dbg_link_downed;
-	u_int32_t dbg_link_suspected;
-	u_int16_t dbg_phyregs[32][4];
-	u_int32_t dbg_rxlowbufs;
-	u_int32_t dbg_rxintrs;
-	u_int32_t dbg_last_rxintrs;
-	u_int32_t dbg_high_rxintrs_hz;
-	u_int32_t dbg_rxpktsperintr[TULIP_RXDESCS];
-    } tulip_dbg;
-#endif
-    struct ifqueue tulip_txq;
-    struct ifqueue tulip_rxq;
-    struct ifmib_iso_8802_3 tulip_dot3stats;
-    tulip_ringinfo_t tulip_rxinfo;
-    tulip_ringinfo_t tulip_txinfo;
-    tulip_desc_t tulip_rxdescs[TULIP_RXDESCS];
-    tulip_desc_t tulip_txdescs[TULIP_TXDESCS];
-};
-
-static const char * const tulip_chipdescs[] = { 
-    "21040 [10Mb/s]",
-#if defined(TULIP_EISA)
-    "DE425 [10Mb/s]",
+    sc->tulip_cmdmode |= TULIP_CMD_TXRUN;
+    sc->tulip_flags |= TULIP_TXPROBE_ACTIVE;
+    TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
+    IF_PREPEND(&sc->tulip_if.if_snd, m);
+    tulip_ifstart(&sc->tulip_if);
+    sc->tulip_probe.probe_txprobes++;
+    return 1;
+}
+
+#ifdef BIG_PACKET
+#define TULIP_SIAGEN_WATCHDOG	(sc->tulip_if.if_mtu > ETHERMTU ? TULIP_WATCHDOG_RXDISABLE|TULIP_WATCHDOG_TXDISABLE : 0)
 #else
-    NULL,
+#define	TULIP_SIAGEN_WATCHDOG	0
 #endif
-    "21041 [10Mb/s]",
-    "21140 [10-100Mb/s]",
-    "21140A [10-100Mb/s]",
-    "21142 [10-100Mb/s]",
-};
-
-#define chip(x) DOT3CHIPSET(dot3VendorDigital, dot3ChipSetDigital##x)
-static u_int32_t const tulip_chip2mib[] = {
-	chip(DC21040), chip(DC21040), chip(DC21041), chip(DC21140),
-	chip(DC21140A), chip(DC21142)
-};
-#undef chip
-
-static const char * const tulip_mediums[] = {
-    "unknown",			/* TULIP_MEDIA_UNKNOWN */
-    "10baseT",			/* TULIP_MEDIA_10BASET */
-    "BNC",			/* TULIP_MEDIA_BNC */
-    "AUI",			/* TULIP_MEDIA_AUI */
-    "BNC/AUI",			/* TULIP_MEDIA_BNCAUI */
-    "Full Duplex 10baseT",	/* TULIP_MEDIA_10BASET_FD */
-    "100baseTX",		/* TULIP_MEDIA_100BASET */
-    "Full Duplex 100baseTX",	/* TULIP_MEDIA_100BASET_FD */
-    "100baseT4",		/* TULIP_MEDIA_100BASET4 */
-};
 
-static const tulip_media_t tulip_phy_statuses[] = {
-    TULIP_MEDIA_10BASET, TULIP_MEDIA_10BASET_FD,
-    TULIP_MEDIA_100BASETX, TULIP_MEDIA_100BASETX_FD,
-    TULIP_MEDIA_100BASET4
-};
-
-static const char * const tulip_system_errors[] = {
-    "parity error",
-    "master abort",
-    "target abort",
-    "reserved #3",
-    "reserved #4",
-    "reserved #5",
-    "reserved #6",
-    "reserved #7",
-};
+static void
+tulip_media_set(
+    tulip_softc_t * const sc,
+    tulip_media_t media)
+{
+    const tulip_media_info_t *mi = sc->tulip_mediums[media];
 
-static const char * const tulip_status_bits[] = {
-    NULL,
-    "transmit process stopped",
-    NULL,
-    "transmit jabber timeout",
+    if (mi == NULL)
+	return;
 
-    NULL,
-    "transmit underflow",
-    NULL,
-    "receive underflow",
+    /*
+     * If we are switching media, make sure we don't think there's
+     * any stale RX activity
+     */
+    sc->tulip_flags &= ~TULIP_RXACT;
+    if (mi->mi_type == TULIP_MEDIAINFO_SIA) {
+	TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
+	TULIP_CSR_WRITE(sc, csr_sia_tx_rx,        mi->mi_sia_tx_rx);
+	if (sc->tulip_features & TULIP_HAVE_SIAGP) {
+	    TULIP_CSR_WRITE(sc, csr_sia_general,  mi->mi_sia_gp_control|mi->mi_sia_general|TULIP_SIAGEN_WATCHDOG);
+	    TULIP_CSR_WRITE(sc, csr_sia_general,  mi->mi_sia_gp_data|mi->mi_sia_general|TULIP_SIAGEN_WATCHDOG);
+	} else {
+	    TULIP_CSR_WRITE(sc, csr_sia_general,  mi->mi_sia_general|TULIP_SIAGEN_WATCHDOG);
+	}
+	TULIP_CSR_WRITE(sc, csr_sia_connectivity, mi->mi_sia_connectivity);
+    } else if (mi->mi_type == TULIP_MEDIAINFO_GPR) {
+#define	TULIP_GPR_CMDBITS	(TULIP_CMD_PORTSELECT|TULIP_CMD_PCSFUNCTION|TULIP_CMD_SCRAMBLER|TULIP_CMD_TXTHRSHLDCTL)
+	/*
+	 * If the cmdmode bits don't match the currently operating mode,
+	 * set the cmdmode appropriately and reset the chip.
+	 */
+	if (((mi->mi_cmdmode ^ TULIP_CSR_READ(sc, csr_command)) & TULIP_GPR_CMDBITS) != 0) {
+	    sc->tulip_cmdmode &= ~TULIP_GPR_CMDBITS;
+	    sc->tulip_cmdmode |= mi->mi_cmdmode;
+	    tulip_reset(sc);
+	}
+	TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_PINSET|sc->tulip_gpinit);
+	DELAY(10);
+	TULIP_CSR_WRITE(sc, csr_gp, (u_int8_t) mi->mi_gpdata);
+    } else if (mi->mi_type == TULIP_MEDIAINFO_SYM) {
+	/*
+	 * If the cmdmode bits don't match the currently operating mode,
+	 * set the cmdmode appropriately and reset the chip.
+	 */
+	if (((mi->mi_cmdmode ^ TULIP_CSR_READ(sc, csr_command)) & TULIP_GPR_CMDBITS) != 0) {
+	    sc->tulip_cmdmode &= ~TULIP_GPR_CMDBITS;
+	    sc->tulip_cmdmode |= mi->mi_cmdmode;
+	    tulip_reset(sc);
+	}
+	TULIP_CSR_WRITE(sc, csr_sia_general, mi->mi_gpcontrol);
+	TULIP_CSR_WRITE(sc, csr_sia_general, mi->mi_gpdata);
+    } else if (mi->mi_type == TULIP_MEDIAINFO_MII
+	       && sc->tulip_probe_state != TULIP_PROBE_INACTIVE) {
+	int idx;
+	if (sc->tulip_features & TULIP_HAVE_SIAGP) {
+	    const u_int8_t *dp;
+	    dp = &sc->tulip_rombuf[mi->mi_reset_offset];
+	    for (idx = 0; idx < mi->mi_reset_length; idx++, dp += 2) {
+		DELAY(10);
+		TULIP_CSR_WRITE(sc, csr_sia_general, (dp[0] + 256 * dp[1]) << 16);
+	    }
+	    sc->tulip_phyaddr = mi->mi_phyaddr;
+	    dp = &sc->tulip_rombuf[mi->mi_gpr_offset];
+	    for (idx = 0; idx < mi->mi_gpr_length; idx++, dp += 2) {
+		DELAY(10);
+		TULIP_CSR_WRITE(sc, csr_sia_general, (dp[0] + 256 * dp[1]) << 16);
+	    }
+	} else {
+	    for (idx = 0; idx < mi->mi_reset_length; idx++) {
+		DELAY(10);
+		TULIP_CSR_WRITE(sc, csr_gp, sc->tulip_rombuf[mi->mi_reset_offset + idx]);
+	    }
+	    sc->tulip_phyaddr = mi->mi_phyaddr;
+	    for (idx = 0; idx < mi->mi_gpr_length; idx++) {
+		DELAY(10);
+		TULIP_CSR_WRITE(sc, csr_gp, sc->tulip_rombuf[mi->mi_gpr_offset + idx]);
+	    }
+	}
+	if (sc->tulip_flags & TULIP_TRYNWAY) {
+	    tulip_mii_autonegotiate(sc, sc->tulip_phyaddr);
+	} else if ((sc->tulip_flags & TULIP_DIDNWAY) == 0) {
+	    u_int32_t data = tulip_mii_readreg(sc, sc->tulip_phyaddr, PHYREG_CONTROL);
+	    data &= ~(PHYCTL_SELECT_100MB|PHYCTL_FULL_DUPLEX|PHYCTL_AUTONEG_ENABLE);
+	    sc->tulip_flags &= ~TULIP_DIDNWAY;
+	    if (TULIP_IS_MEDIA_FD(media))
+		data |= PHYCTL_FULL_DUPLEX;
+	    if (TULIP_IS_MEDIA_100MB(media))
+		data |= PHYCTL_SELECT_100MB;
+	    tulip_mii_writereg(sc, sc->tulip_phyaddr, PHYREG_CONTROL, data);
+	}
+    }
+}
+
+static void
+tulip_linkup(
+    tulip_softc_t * const sc,
+    tulip_media_t media)
+{
+    if ((sc->tulip_flags & TULIP_LINKUP) == 0)
+	sc->tulip_flags |= TULIP_PRINTLINKUP;
+    sc->tulip_flags |= TULIP_LINKUP;
+    sc->tulip_if.if_flags &= ~IFF_OACTIVE;
+#if 0 /* XXX how does with work with ifmedia? */
+    if ((sc->tulip_flags & TULIP_DIDNWAY) == 0) {
+	if (sc->tulip_if.if_flags & IFF_FULLDUPLEX) {
+	    if (TULIP_CAN_MEDIA_FD(media)
+		    && sc->tulip_mediums[TULIP_FD_MEDIA_OF(media)] != NULL)
+		media = TULIP_FD_MEDIA_OF(media);
+	} else {
+	    if (TULIP_IS_MEDIA_FD(media)
+		    && sc->tulip_mediums[TULIP_HD_MEDIA_OF(media)] != NULL)
+		media = TULIP_HD_MEDIA_OF(media);
+	}
+    }
+#endif
+    if (sc->tulip_media != media) {
+#ifdef TULIP_DEBUG
+	sc->tulip_dbg.dbg_last_media = sc->tulip_media;
+#endif
+	sc->tulip_media = media;
+	sc->tulip_flags |= TULIP_PRINTMEDIA;
+	if (TULIP_IS_MEDIA_FD(sc->tulip_media)) {
+	    sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX;
+	} else if (sc->tulip_chipid != TULIP_21041 || (sc->tulip_flags & TULIP_DIDNWAY) == 0) {
+	    sc->tulip_cmdmode &= ~TULIP_CMD_FULLDUPLEX;
+	}
+    }
+    /*
+     * We could set probe_timeout to 0 but setting to 3000 puts this
+     * in one central place and the only matters is tulip_link is
+     * followed by a tulip_timeout.  Therefore setting it should not
+     * result in aberrant behavour.
+     */
+    sc->tulip_probe_timeout = 3000;
+    sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
+    sc->tulip_flags &= ~(TULIP_TXPROBE_ACTIVE|TULIP_TRYNWAY);
+    if (sc->tulip_flags & TULIP_INRESET) {
+	tulip_media_set(sc, sc->tulip_media);
+    } else {
+	tulip_reset(sc);
+	tulip_init(sc);
+    }
+}
+
+static void
+tulip_media_print(
+    tulip_softc_t * const sc)
+{
+    if ((sc->tulip_flags & TULIP_LINKUP) == 0)
+	return;
+    if (sc->tulip_flags & TULIP_PRINTMEDIA) {
+	printf(TULIP_PRINTF_FMT ": enabling %s port\n",
+	       TULIP_PRINTF_ARGS,
+	       tulip_mediums[sc->tulip_media]);
+	sc->tulip_flags &= ~(TULIP_PRINTMEDIA|TULIP_PRINTLINKUP);
+    } else if (sc->tulip_flags & TULIP_PRINTLINKUP) {
+	printf(TULIP_PRINTF_FMT ": link up\n", TULIP_PRINTF_ARGS);
+	sc->tulip_flags &= ~TULIP_PRINTLINKUP;
+    }
+}
+
+#if defined(TULIP_DO_GPR_SENSE)
+static tulip_media_t
+tulip_21140_gpr_media_sense(
+    tulip_softc_t * const sc)
+{
+    tulip_media_t maybe_media = TULIP_MEDIA_UNKNOWN;
+    tulip_media_t last_media = TULIP_MEDIA_UNKNOWN;
+    tulip_media_t media;
 
-    "receive process stopped",
-    "receive watchdog timeout",
-    NULL,
-    NULL,
+    /*
+     * If one of the media blocks contained a default media flag,
+     * use that.
+     */
+    for (media = TULIP_MEDIA_UNKNOWN; media < TULIP_MEDIA_MAX; media++) {
+	const tulip_media_info_t *mi;
+	/*
+	 * Media is not supported (or is full-duplex).
+	 */
+	if ((mi = sc->tulip_mediums[media]) == NULL || TULIP_IS_MEDIA_FD(media))
+	    continue;
+	if (mi->mi_type != TULIP_MEDIAINFO_GPR)
+	    continue;
 
-    "link failure",
-    NULL,
-    NULL,
-};
+	/*
+	 * Remember the media is this is the "default" media.
+	 */
+	if (mi->mi_default && maybe_media == TULIP_MEDIA_UNKNOWN)
+	    maybe_media = media;
 
-#ifndef IFF_ALTPHYS
-#define	IFF_ALTPHYS	IFF_LINK2		/* In case it isn't defined */
-#endif
+	/*
+	 * No activity mask?  Can't see if it is active if there's no mask.
+	 */
+	if (mi->mi_actmask == 0)
+	    continue;
 
-#ifndef IFF_FULLDUPLEX
-#define	IFF_FULLDUPLEX	IFF_LINK1
-#endif
+	/*
+	 * Does the activity data match?
+	 */
+	if ((TULIP_CSR_READ(sc, csr_gp) & mi->mi_actmask) != mi->mi_actdata)
+	    continue;
 
-#ifndef	IFF_NOAUTONEG
-#if IFF_ALTPHYS == IFF_LINK2
-#define	IFF_NOAUTONEG	IFF_LINK0
-#else 
-#define	IFF_NOAUTONEG	IFF_LINK2
-#endif
+#if defined(TULIP_DEBUG)
+	printf(TULIP_PRINTF_FMT ": gpr_media_sense: %s: 0x%02x & 0x%02x == 0x%02x\n",
+	       TULIP_PRINTF_ARGS, tulip_mediums[media],
+	       TULIP_CSR_READ(sc, csr_gp) & 0xFF,
+	       mi->mi_actmask, mi->mi_actdata);
 #endif
+	/*
+	 * It does!  If this is the first media we detected, then 
+	 * remember this media.  If isn't the first, then there were
+	 * multiple matches which we equate to no match (since we don't
+	 * which to select (if any).
+	 */
+	if (last_media == TULIP_MEDIA_UNKNOWN) {
+	    last_media = media;
+	} else if (last_media != media) {
+	    last_media = TULIP_MEDIA_UNKNOWN;
+	}
+    }
+    return (last_media != TULIP_MEDIA_UNKNOWN) ? last_media : maybe_media;
+}
+#endif /* TULIP_DO_GPR_SENSE */
+
+static tulip_link_status_t
+tulip_media_link_monitor(
+    tulip_softc_t * const sc)
+{
+    const tulip_media_info_t * const mi = sc->tulip_mediums[sc->tulip_media];
+    tulip_link_status_t linkup = TULIP_LINK_DOWN;
 
-#if (IFF_ALTPHYS&IFF_FULLDUPLEX&IFF_NOAUTONEG) != 0
-#error IFF_ALTPHYS, IFF_FULLDUPLEX, IFF_NOAUTONEG overlap
+    if (mi == NULL) {
+#if defined(DIAGNOSTIC) || defined(TULIP_DEBUG)
+	panic("tulip_media_link_monitor: %s: botch at line %d\n",
+	      tulip_mediums[sc->tulip_media],__LINE__);
 #endif
+	return TULIP_LINK_UNKNOWN;
+    }
 
-/*
- * This driver supports a maximum of 32 tulip boards.
- * This should be enough for the forseeable future.
- */
-#define	TULIP_MAX_DEVICES	32
-
-#if defined(TULIP_USE_SOFTINTR)
-static u_int32_t tulip_softintr_mask;
-static int tulip_softintr_last_unit;
-static int tulip_softintr_max_unit;
-static void tulip_softintr(void);
-#endif
 
+    /*
+     * Have we seen some packets?  If so, the link must be good.
+     */
+    if ((sc->tulip_flags & (TULIP_RXACT|TULIP_LINKUP)) == (TULIP_RXACT|TULIP_LINKUP)) {
+	sc->tulip_flags &= ~TULIP_RXACT;
+	sc->tulip_probe_timeout = 3000;
+	return TULIP_LINK_UP;
+    }
 
-#if defined(__FreeBSD__)
-typedef void ifnet_ret_t;
-typedef int ioctl_cmd_t;
-tulip_softc_t *tulips[TULIP_MAX_DEVICES];
-#if BSD >= 199506
-#define TULIP_IFP_TO_SOFTC(ifp) ((tulip_softc_t *)((ifp)->if_softc))
-#if NBPFILTER > 0
-#define	TULIP_BPF_MTAP(sc, m)	bpf_mtap(&(sc)->tulip_if, m)
-#define	TULIP_BPF_TAP(sc, p, l)	bpf_tap(&(sc)->tulip_if, p, l)
-#define	TULIP_BPF_ATTACH(sc)	bpfattach(&(sc)->tulip_if, DLT_EN10MB, sizeof(struct ether_header))
-#endif
-#define	tulip_intrfunc_t	void
-#define	TULIP_VOID_INTRFUNC
-#define	IFF_NOTRAILERS		0
-#define	CLBYTES			PAGE_SIZE
-#if 0
-#define	TULIP_KVATOPHYS(sc, va)	kvtop(va)
-#endif
-#define	TULIP_EADDR_FMT		"%6D"
-#define	TULIP_EADDR_ARGS(addr)	addr, ":"
-#else
-extern int bootverbose;
-#define TULIP_IFP_TO_SOFTC(ifp)         (TULIP_UNIT_TO_SOFTC((ifp)->if_unit))
-#endif
-#if defined(TULIP_USE_SOFTINTR)
-NETISR_SET(NETISR_DE, tulip_softintr);
-#endif
-#define	TULIP_UNIT_TO_SOFTC(unit)	(tulips[unit])
-#define	TULIP_BURSTSIZE(unit)		pci_max_burst_len
-#define	loudprintf			if (bootverbose) printf
+    sc->tulip_flags &= ~TULIP_RXACT;
+    if (mi->mi_type == TULIP_MEDIAINFO_MII) {
+	u_int32_t status;
+	/*
+	 * Read the PHY status register.
+	 */
+	status = tulip_mii_readreg(sc, sc->tulip_phyaddr, PHYREG_STATUS);
+	if (status & PHYSTS_AUTONEG_DONE) {
+	    /*
+	     * If the PHY has completed autonegotiation, see the if the
+	     * remote systems abilities have changed.  If so, upgrade or
+	     * downgrade as appropriate.
+	     */
+	    u_int32_t abilities = tulip_mii_readreg(sc, sc->tulip_phyaddr, PHYREG_AUTONEG_ABILITIES);
+	    abilities = (abilities << 6) & status;
+	    if (abilities != sc->tulip_abilities) {
+#if defined(TULIP_DEBUG)
+		loudprintf(TULIP_PRINTF_FMT "(phy%d): autonegotiation changed: 0x%04x -> 0x%04x\n",
+			   TULIP_PRINTF_ARGS, sc->tulip_phyaddr,
+			   sc->tulip_abilities, abilities);
 #endif
+		if (tulip_mii_map_abilities(sc, abilities)) {
+		    tulip_linkup(sc, sc->tulip_probe_media);
+		    return TULIP_LINK_UP;
+		}
+		/*
+		 * if we had selected media because of autonegotiation,
+		 * we need to probe for the new media.
+		 */
+		sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
+		if (sc->tulip_flags & TULIP_DIDNWAY)
+		    return TULIP_LINK_DOWN;
+	    }
+	}
+	/*
+	 * The link is now up.  If was down, say its back up.
+	 */
+	if ((status & (PHYSTS_LINK_UP|PHYSTS_REMOTE_FAULT)) == PHYSTS_LINK_UP)
+	    linkup = TULIP_LINK_UP;
+    } else if (mi->mi_type == TULIP_MEDIAINFO_GPR) {
+	/*
+	 * No activity sensor?  Assume all's well.
+	 */
+	if (mi->mi_actmask == 0)
+	    return TULIP_LINK_UNKNOWN;
+	/*
+	 * Does the activity data match?
+	 */
+	if ((TULIP_CSR_READ(sc, csr_gp) & mi->mi_actmask) == mi->mi_actdata)
+	    linkup = TULIP_LINK_UP;
+    } else if (mi->mi_type == TULIP_MEDIAINFO_SIA) {
+	/*
+	 * Assume non TP ok for now.
+	 */
+	if (!TULIP_IS_MEDIA_TP(sc->tulip_media))
+	    return TULIP_LINK_UNKNOWN;
+	if ((TULIP_CSR_READ(sc, csr_sia_status) & TULIP_SIASTS_LINKFAIL) == 0)
+	    linkup = TULIP_LINK_UP;
+    } else if (mi->mi_type == TULIP_MEDIAINFO_SYM) {
+	return TULIP_LINK_UNKNOWN;
+    }
+    /*
+     * We will wait for 3 seconds until the link goes into suspect mode.
+     */
+    if (sc->tulip_flags & TULIP_LINKUP) {
+	if (linkup == TULIP_LINK_UP)
+	    sc->tulip_probe_timeout = 3000;
+	if (sc->tulip_probe_timeout > 0)
+	    return TULIP_LINK_UP;
 
-#if defined(__bsdi__)
-typedef int ifnet_ret_t;
-typedef int ioctl_cmd_t;
-extern struct cfdriver decd;
-#define	TULIP_UNIT_TO_SOFTC(unit)	((tulip_softc_t *) decd.cd_devs[unit])
-#define TULIP_IFP_TO_SOFTC(ifp)		(TULIP_UNIT_TO_SOFTC((ifp)->if_unit))
-#if _BSDI_VERSION >= 199510
-#if 0
-#define	TULIP_BURSTSIZE(unit)		log2_burst_size
+	sc->tulip_flags &= ~TULIP_LINKUP;
+	printf(TULIP_PRINTF_FMT ": link down: cable problem?\n", TULIP_PRINTF_ARGS);
+    }
+#if defined(TULIP_DEBUG)
+    sc->tulip_dbg.dbg_link_downed++;
 #endif
-#define	loudprintf			aprint_verbose
-#define	printf				(*sc->tulip_pf)
-#elif _BSDI_VERSION <= 199401
-#define	DRQNONE				0
-#define	loudprintf			printf
+    return TULIP_LINK_DOWN;
+}
+
 static void
-arp_ifinit(
-    struct arpcom *ac,
-    struct ifaddr *ifa)
+tulip_media_poll(
+    tulip_softc_t * const sc,
+    tulip_mediapoll_event_t event)
 {
-    ac->ac_ipaddr = IA_SIN(ifa)->sin_addr;
-    arpwhohas(ac, &ac->ac_ipaddr);
-}
-#endif
-#endif	/* __bsdi__ */
-
-#if defined(__NetBSD__)
-typedef void ifnet_ret_t;
-typedef u_long ioctl_cmd_t;
-extern struct cfattach de_ca;
-extern struct cfdriver de_cd;
-#define	TULIP_UNIT_TO_SOFTC(unit)	((tulip_softc_t *) de_cd.cd_devs[unit])
-#define TULIP_IFP_TO_SOFTC(ifp)         ((tulip_softc_t *)((ifp)->if_softc))
-#define	tulip_xname			tulip_ac.ac_if.if_xname
-#define	tulip_unit			tulip_dev.dv_unit
-#define	loudprintf			printf
-#define	TULIP_PRINTF_FMT		"%s"
-#define	TULIP_PRINTF_ARGS		sc->tulip_xname
-#if defined(__alpha__)
-/* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */
-#define TULIP_KVATOPHYS(va)		(vtophys(va) | 0x40000000)
+#if defined(TULIP_DEBUG)
+    sc->tulip_dbg.dbg_events[event]++;
 #endif
-#endif	/* __NetBSD__ */
+    if (sc->tulip_probe_state == TULIP_PROBE_INACTIVE
+	    && event == TULIP_MEDIAPOLL_TIMER) {
+	switch (tulip_media_link_monitor(sc)) {
+	    case TULIP_LINK_DOWN: {
+		/*
+		 * Link Monitor failed.  Probe for new media.
+		 */
+		event = TULIP_MEDIAPOLL_LINKFAIL;
+		break;
+	    }
+	    case TULIP_LINK_UP: {
+		/*
+		 * Check again soon.
+		 */
+		tulip_timeout(sc);
+		return;
+	    }
+	    case TULIP_LINK_UNKNOWN: {
+		/*
+		 * We can't tell so don't bother.
+		 */
+		return;
+	    }
+	}
+    }
 
-#ifndef TULIP_PRINTF_FMT
-#define	TULIP_PRINTF_FMT		"%s%d"
+    if (event == TULIP_MEDIAPOLL_LINKFAIL) {
+	if (sc->tulip_probe_state == TULIP_PROBE_INACTIVE) {
+	    if (TULIP_DO_AUTOSENSE(sc)) {
+#if defined(TULIP_DEBUG)
+		sc->tulip_dbg.dbg_link_failures++;
 #endif
-#ifndef TULIP_PRINTF_ARGS
-#define	TULIP_PRINTF_ARGS		sc->tulip_name, sc->tulip_unit
+		sc->tulip_media = TULIP_MEDIA_UNKNOWN;
+		tulip_reset(sc);	/* restart probe */
+	    }
+	    return;
+	}
+#if defined(TULIP_DEBUG)
+	sc->tulip_dbg.dbg_link_pollintrs++;
 #endif
+    }
 
-#ifndef TULIP_BURSTSIZE
-#define	TULIP_BURSTSIZE(unit)		3
+    if (event == TULIP_MEDIAPOLL_START) {
+	sc->tulip_if.if_flags |= IFF_OACTIVE;
+	if (sc->tulip_probe_state != TULIP_PROBE_INACTIVE)
+	    return;
+	sc->tulip_probe_mediamask = 0;
+	sc->tulip_probe_passes = 0;
+#if defined(TULIP_DEBUG)
+	sc->tulip_dbg.dbg_media_probes++;
 #endif
+	/*
+	 * If the SROM contained an explicit media to use, use it.
+	 */
+	sc->tulip_cmdmode &= ~(TULIP_CMD_RXRUN|TULIP_CMD_FULLDUPLEX);
+	sc->tulip_flags |= TULIP_TRYNWAY|TULIP_PROBE1STPASS;
+	sc->tulip_flags &= ~(TULIP_DIDNWAY|TULIP_PRINTMEDIA|TULIP_PRINTLINKUP);
+	/*
+	 * connidx is defaulted to a media_unknown type.
+	 */
+	sc->tulip_probe_media = tulip_srom_conninfo[sc->tulip_connidx].sc_media;
+	if (sc->tulip_probe_media != TULIP_MEDIA_UNKNOWN) {
+	    tulip_linkup(sc, sc->tulip_probe_media);
+	    tulip_timeout(sc);
+	    return;
+	}
 
-#define	tulip_if	tulip_ac.ac_if
-#ifndef tulip_unit
-#define	tulip_unit	tulip_ac.ac_if.if_unit
-#endif
-#define	tulip_name	tulip_ac.ac_if.if_name
-#define	tulip_hwaddr	tulip_ac.ac_enaddr
+	if (sc->tulip_features & TULIP_HAVE_GPR) {
+	    sc->tulip_probe_state = TULIP_PROBE_GPRTEST;
+	    sc->tulip_probe_timeout = 2000;
+	} else {
+	    sc->tulip_probe_media = TULIP_MEDIA_MAX;
+	    sc->tulip_probe_timeout = 0;
+	    sc->tulip_probe_state = TULIP_PROBE_MEDIATEST;
+	}
+    }
 
-#if !defined(tulip_bpf) && (!defined(__bsdi__) || _BSDI_VERSION >= 199401)
-#define	tulip_bpf	tulip_ac.ac_if.if_bpf
-#endif
+    /*
+     * Ignore txprobe failures or spurious callbacks.
+     */
+    if (event == TULIP_MEDIAPOLL_TXPROBE_FAILED
+	    && sc->tulip_probe_state != TULIP_PROBE_MEDIATEST) {
+	sc->tulip_flags &= ~TULIP_TXPROBE_ACTIVE;
+	return;
+    }
 
-#if !defined(tulip_intrfunc_t)
-#define	tulip_intrfunc_t	int
+    /*
+     * If we really transmitted a packet, then that's the media we'll use.
+     */
+    if (event == TULIP_MEDIAPOLL_TXPROBE_OK || event == TULIP_MEDIAPOLL_LINKPASS) {
+	if (event == TULIP_MEDIAPOLL_LINKPASS)
+	    sc->tulip_probe_media = TULIP_MEDIA_10BASET;
+#if defined(TULIP_DEBUG)
+	else
+	    sc->tulip_dbg.dbg_txprobes_ok[sc->tulip_probe_media]++;
 #endif
+	tulip_linkup(sc, sc->tulip_probe_media);
+	tulip_timeout(sc);
+	return;
+    }
 
-#if !defined(TULIP_KVATOPHYS)
-#define	TULIP_KVATOPHYS(sc, va)	vtophys(va)
+    if (sc->tulip_probe_state == TULIP_PROBE_GPRTEST) {
+#if defined(TULIP_DO_GPR_SENSE)
+	/*
+	 * Check for media via the general purpose register.
+	 *
+	 * Try to sense the media via the GPR.  If the same value
+	 * occurs 3 times in a row then just use that.
+	 */
+	if (sc->tulip_probe_timeout > 0) {
+	    tulip_media_t new_probe_media = tulip_21140_gpr_media_sense(sc);
+#if defined(TULIP_DEBUG)
+	    printf(TULIP_PRINTF_FMT ": media_poll: gpr sensing = %s\n",
+		   TULIP_PRINTF_ARGS, tulip_mediums[new_probe_media]);
 #endif
+	    if (new_probe_media != TULIP_MEDIA_UNKNOWN) {
+		if (new_probe_media == sc->tulip_probe_media) {
+		    if (--sc->tulip_probe_count == 0)
+			tulip_linkup(sc, sc->tulip_probe_media);
+		} else {
+		    sc->tulip_probe_count = 10;
+		}
+	    }
+	    sc->tulip_probe_media = new_probe_media;
+	    tulip_timeout(sc);
+	    return;
+	}
+#endif /* TULIP_DO_GPR_SENSE */
+	/*
+	 * Brute force.  We cycle through each of the media types
+	 * and try to transmit a packet.
+	 */
+	sc->tulip_probe_state = TULIP_PROBE_MEDIATEST;
+	sc->tulip_probe_media = TULIP_MEDIA_MAX;
+	sc->tulip_probe_timeout = 0;
+	tulip_timeout(sc);
+	return;
+    }
 
-/*
- * While I think FreeBSD's 2.2 change to the bpf is a nice simplification,
- * it does add yet more conditional code to this driver.  Sigh.
- */
-#if !defined(TULIP_BPF_MTAP) && NBPFILTER > 0
-#define	TULIP_BPF_MTAP(sc, m)	bpf_mtap((sc)->tulip_bpf, m)
-#define	TULIP_BPF_TAP(sc, p, l)	bpf_tap((sc)->tulip_bpf, p, l)
-#define	TULIP_BPF_ATTACH(sc)	bpfattach(&(sc)->tulip_bpf, &(sc)->tulip_if, DLT_EN10MB, sizeof(struct ether_header))
+    if (sc->tulip_probe_state != TULIP_PROBE_MEDIATEST
+	   && (sc->tulip_features & TULIP_HAVE_MII)) {
+	tulip_media_t old_media = sc->tulip_probe_media;
+	tulip_mii_autonegotiate(sc, sc->tulip_phyaddr);
+	switch (sc->tulip_probe_state) {
+	    case TULIP_PROBE_FAILED:
+	    case TULIP_PROBE_MEDIATEST: {
+		/*
+		 * Try the next media.
+		 */
+		sc->tulip_probe_mediamask |= sc->tulip_mediums[sc->tulip_probe_media]->mi_mediamask;
+		sc->tulip_probe_timeout = 0;
+#ifdef notyet
+		if (sc->tulip_probe_state == TULIP_PROBE_FAILED)
+		    break;
+		if (sc->tulip_probe_media != tulip_mii_phy_readspecific(sc))
+		    break;
+		sc->tulip_probe_timeout = TULIP_IS_MEDIA_TP(sc->tulip_probe_media) ? 2500 : 300;
 #endif
-
-/*
- * However, this change to FreeBSD I am much less enamored with.
- */
-#if !defined(TULIP_EADDR_FMT)
-#define	TULIP_EADDR_FMT		"%s"
-#define	TULIP_EADDR_ARGS(addr)	ether_sprintf(addr)
+		break;
+	    }
+	    case TULIP_PROBE_PHYAUTONEG: {
+		return;
+	    }
+	    case TULIP_PROBE_INACTIVE: {
+		/*
+		 * Only probe if we autonegotiated a media that hasn't failed.
+		 */
+		sc->tulip_probe_timeout = 0;
+		if (sc->tulip_probe_mediamask & TULIP_BIT(sc->tulip_probe_media)) {
+		    sc->tulip_probe_media = old_media;
+		    break;
+		}
+		tulip_linkup(sc, sc->tulip_probe_media);
+		tulip_timeout(sc);
+		return;
+	    }
+	    default: {
+#if defined(DIAGNOSTIC) || defined(TULIP_DEBUG)
+		panic("tulip_media_poll: botch at line %d\n", __LINE__);
 #endif
+		break;
+	    }
+	}
+    }
 
-#define	TULIP_CRC32_POLY	0xEDB88320UL	/* CRC-32 Poly -- Little Endian */
-#define	TULIP_MAX_TXSEG		30
+    if (event == TULIP_MEDIAPOLL_TXPROBE_FAILED) {
+#if defined(TULIP_DEBUG)
+	sc->tulip_dbg.dbg_txprobes_failed[sc->tulip_probe_media]++;
+#endif
+	sc->tulip_flags &= ~TULIP_TXPROBE_ACTIVE;
+	return;
+    }
 
-#define	TULIP_ADDREQUAL(a1, a2) \
-	(((u_int16_t *)a1)[0] == ((u_int16_t *)a2)[0] \
-	 && ((u_int16_t *)a1)[1] == ((u_int16_t *)a2)[1] \
-	 && ((u_int16_t *)a1)[2] == ((u_int16_t *)a2)[2])
-#define	TULIP_ADDRBRDCST(a1) \
-	(((u_int16_t *)a1)[0] == 0xFFFFU \
-	 && ((u_int16_t *)a1)[1] == 0xFFFFU \
-	 && ((u_int16_t *)a1)[2] == 0xFFFFU)
+    /*
+     * switch to another media if we tried this one enough.
+     */
+    if (/* event == TULIP_MEDIAPOLL_TXPROBE_FAILED || */ sc->tulip_probe_timeout <= 0) {
+#if defined(TULIP_DEBUG)
+	if (sc->tulip_probe_media == TULIP_MEDIA_UNKNOWN) {
+	    printf(TULIP_PRINTF_FMT ": poll media unknown!\n",
+		   TULIP_PRINTF_ARGS);
+	    sc->tulip_probe_media = TULIP_MEDIA_MAX;
+	}
+#endif
+	/*
+	 * Find the next media type to check for.  Full Duplex
+	 * types are not allowed.
+	 */
+	do {
+	    sc->tulip_probe_media -= 1;
+	    if (sc->tulip_probe_media == TULIP_MEDIA_UNKNOWN) {
+		if (++sc->tulip_probe_passes == 3) {
+		    printf(TULIP_PRINTF_FMT ": autosense failed: cable problem?\n",
+			   TULIP_PRINTF_ARGS);
+		    if ((sc->tulip_if.if_flags & IFF_UP) == 0) {
+			sc->tulip_if.if_flags &= ~IFF_RUNNING;
+			sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
+			return;
+		    }
+		}
+		sc->tulip_flags ^= TULIP_TRYNWAY;	/* XXX */
+		sc->tulip_probe_mediamask = 0;
+		sc->tulip_probe_media = TULIP_MEDIA_MAX - 1;
+	    }
+	} while (sc->tulip_mediums[sc->tulip_probe_media] == NULL
+		 || (sc->tulip_probe_mediamask & TULIP_BIT(sc->tulip_probe_media))
+		 || TULIP_IS_MEDIA_FD(sc->tulip_probe_media));
 
-typedef int tulip_spl_t;
+#if defined(TULIP_DEBUG)
+	printf(TULIP_PRINTF_FMT ": %s: probing %s\n", TULIP_PRINTF_ARGS,
+	       event == TULIP_MEDIAPOLL_TXPROBE_FAILED ? "txprobe failed" : "timeout",
+	       tulip_mediums[sc->tulip_probe_media]);
+#endif
+	sc->tulip_probe_timeout = TULIP_IS_MEDIA_TP(sc->tulip_probe_media) ? 2500 : 1000;
+	sc->tulip_probe_state = TULIP_PROBE_MEDIATEST;
+	sc->tulip_probe.probe_txprobes = 0;
+	tulip_reset(sc);
+	tulip_media_set(sc, sc->tulip_probe_media);
+	sc->tulip_flags &= ~TULIP_TXPROBE_ACTIVE;
+    }
+    tulip_timeout(sc);
 
-static tulip_intrfunc_t tulip_intr_shared(void *arg);
-static tulip_intrfunc_t tulip_intr_normal(void *arg);
-static void tulip_reset(tulip_softc_t * const sc);
-static ifnet_ret_t tulip_ifstart(struct ifnet *ifp);
-static void tulip_rx_intr(tulip_softc_t * const sc);
-static void tulip_addr_filter(tulip_softc_t * const sc);
-static unsigned tulip_mii_readreg(tulip_softc_t * const sc, unsigned devaddr, unsigned regno);
-static void tulip_mii_writereg(tulip_softc_t * const sc, unsigned devaddr, unsigned regno, unsigned data);
+    /*
+     * If this is hanging off a phy, we know are doing NWAY and we have
+     * forced the phy to a specific speed.  Wait for link up before
+     * before sending a packet.
+     */
+    switch (sc->tulip_mediums[sc->tulip_probe_media]->mi_type) {
+	case TULIP_MEDIAINFO_MII: {
+	    if (sc->tulip_probe_media != tulip_mii_phy_readspecific(sc))
+		return;
+	    break;
+	}
+	case TULIP_MEDIAINFO_SIA: {
+	    if (TULIP_IS_MEDIA_TP(sc->tulip_probe_media)) {
+		if (TULIP_CSR_READ(sc, csr_sia_status) & TULIP_SIASTS_LINKFAIL)
+		    return;
+		tulip_linkup(sc, sc->tulip_probe_media);
+#ifdef notyet
+		if (sc->tulip_features & TULIP_HAVE_MII)
+		    tulip_timeout(sc);
+#endif
+		return;
+	    }
+	    break;
+	}
+	case TULIP_MEDIAINFO_RESET:
+	case TULIP_MEDIAINFO_SYM:
+	case TULIP_MEDIAINFO_GPR: {
+	    break;
+	}
+    }
+    /*
+     * Try to send a packet.
+     */
+    tulip_txprobe(sc);
+}
 
-static int
-tulip_21040_media_probe(
+static void
+tulip_media_select(
     tulip_softc_t * const sc)
 {
-    int cnt;
+    if (sc->tulip_features & TULIP_HAVE_GPR) {
+	TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_PINSET|sc->tulip_gpinit);
+	DELAY(10);
+	TULIP_CSR_WRITE(sc, csr_gp, sc->tulip_gpdata);
+    }
+    /*
+     * If this board has no media, just return
+     */
+    if (sc->tulip_features & TULIP_HAVE_NOMEDIA)
+	return;
 
-    TULIP_CSR_WRITE(sc, csr_sia_connectivity, 0);
-    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_10BASET);
-    for (cnt = 0; cnt < 2400; cnt++) {
-	if ((TULIP_CSR_READ(sc, csr_sia_status) & TULIP_SIASTS_LINKFAIL) == 0)
-	    break;
-	DELAY(1000);
+    if (sc->tulip_media == TULIP_MEDIA_UNKNOWN) {
+	TULIP_CSR_WRITE(sc, csr_intr, sc->tulip_intrmask);
+	(*sc->tulip_boardsw->bd_media_poll)(sc, TULIP_MEDIAPOLL_START);
+    } else {
+	tulip_media_set(sc, sc->tulip_media);
     }
-    sc->tulip_if.if_baudrate = 10000000;
-    return (TULIP_CSR_READ(sc, csr_sia_status) & TULIP_SIASTS_LINKFAIL) != 0;
 }
-
+
 static void
-tulip_21040_media_select(
-    tulip_softc_t * const sc)
+tulip_21040_mediainfo_init(
+    tulip_softc_t * const sc,
+    tulip_media_t media)
 {
     sc->tulip_cmdmode |= TULIP_CMD_CAPTREFFCT|TULIP_CMD_THRSHLD160
 	|TULIP_CMD_BACKOFFCTR;
-    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
-    sc->tulip_flags |= TULIP_SQETEST|TULIP_LINKUP;
-    if (sc->tulip_if.if_flags & IFF_ALTPHYS) {
-	TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_AUI);
-	sc->tulip_media = TULIP_MEDIA_BNCAUI;
-	sc->tulip_cmdmode &= ~TULIP_CMD_FULLDUPLEX;
-	if ((sc->tulip_flags & TULIP_ALTPHYS) == 0)
-	    sc->tulip_flags |= TULIP_PRINTMEDIA|TULIP_ALTPHYS;
-    } else {
-	if (sc->tulip_if.if_flags & IFF_FULLDUPLEX) {
-	    sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX;
-	    sc->tulip_media = TULIP_MEDIA_10BASET_FD;
-	    sc->tulip_flags &= ~TULIP_SQETEST;
-	} else {
-	    sc->tulip_cmdmode &= ~TULIP_CMD_FULLDUPLEX;
-	    sc->tulip_media = TULIP_MEDIA_10BASET;
-	}
-	if (sc->tulip_flags & TULIP_ALTPHYS)
-	    sc->tulip_flags ^= TULIP_PRINTMEDIA|TULIP_ALTPHYS;
-	TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_10BASET);
+    sc->tulip_if.if_baudrate = 10000000;
+
+    if (media == TULIP_MEDIA_10BASET || media == TULIP_MEDIA_UNKNOWN) {
+	TULIP_MEDIAINFO_SIA_INIT(sc, &sc->tulip_mediainfo[0], 21040, 10BASET);
+	TULIP_MEDIAINFO_SIA_INIT(sc, &sc->tulip_mediainfo[1], 21040, 10BASET_FD);
+    }
+
+    if (media == TULIP_MEDIA_AUIBNC || media == TULIP_MEDIA_UNKNOWN) {
+	TULIP_MEDIAINFO_SIA_INIT(sc, &sc->tulip_mediainfo[2], 21040, AUIBNC);
+    }
+
+    if (media == TULIP_MEDIA_UNKNOWN) {
+	TULIP_MEDIAINFO_SIA_INIT(sc, &sc->tulip_mediainfo[3], 21040, EXTSIA);
     }
 }
 
-static int
+static void
+tulip_21040_media_probe(
+    tulip_softc_t * const sc)
+{
+    tulip_21040_mediainfo_init(sc, TULIP_MEDIA_UNKNOWN);
+    return;
+}
+
+static void
 tulip_21040_10baset_only_media_probe(
     tulip_softc_t * const sc)
 {
-    TULIP_CSR_WRITE(sc, csr_sia_connectivity, 0);
-    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_10BASET);
-    sc->tulip_if.if_baudrate = 10000000;
-    return 0;
+    tulip_21040_mediainfo_init(sc, TULIP_MEDIA_10BASET);
+    tulip_media_set(sc, TULIP_MEDIA_10BASET);
+    sc->tulip_media = TULIP_MEDIA_10BASET;
 }
 
 static void
 tulip_21040_10baset_only_media_select(
     tulip_softc_t * const sc)
 {
-    sc->tulip_cmdmode |= TULIP_CMD_CAPTREFFCT|TULIP_CMD_THRSHLD160
-	|TULIP_CMD_BACKOFFCTR;
     sc->tulip_flags |= TULIP_LINKUP;
-    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
-    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_10BASET);
-    if (sc->tulip_if.if_flags & IFF_FULLDUPLEX) {
+    if (sc->tulip_media == TULIP_MEDIA_10BASET_FD) {
 	sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX;
-	sc->tulip_media = TULIP_MEDIA_10BASET_FD;
 	sc->tulip_flags &= ~TULIP_SQETEST;
     } else {
 	sc->tulip_cmdmode &= ~TULIP_CMD_FULLDUPLEX;
-	sc->tulip_media = TULIP_MEDIA_10BASET;
 	sc->tulip_flags |= TULIP_SQETEST;
     }
-    if (sc->tulip_flags & TULIP_ALTPHYS)
-	sc->tulip_flags ^= TULIP_PRINTMEDIA|TULIP_ALTPHYS;
-    sc->tulip_flags &= ~TULIP_ALTPHYS;
+    tulip_media_set(sc, sc->tulip_media);
 }
 
-static int
+static void
 tulip_21040_auibnc_only_media_probe(
     tulip_softc_t * const sc)
 {
-    TULIP_CSR_WRITE(sc, csr_sia_connectivity, 0);
-    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_AUI);
-    sc->tulip_if.if_baudrate = 10000000;
+    tulip_21040_mediainfo_init(sc, TULIP_MEDIA_AUIBNC);
     sc->tulip_flags |= TULIP_SQETEST|TULIP_LINKUP;
-    return 0;
+    tulip_media_set(sc, TULIP_MEDIA_AUIBNC);
+    sc->tulip_media = TULIP_MEDIA_AUIBNC;
 }
 
 static void
 tulip_21040_auibnc_only_media_select(
     tulip_softc_t * const sc)
 {
-    sc->tulip_cmdmode |= TULIP_CMD_CAPTREFFCT|TULIP_CMD_THRSHLD160
-	|TULIP_CMD_BACKOFFCTR;
-    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
-    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_AUI);
-    if (sc->tulip_if.if_flags & IFF_FULLDUPLEX)
-	sc->tulip_if.if_flags &= ~IFF_FULLDUPLEX;
-    sc->tulip_media = TULIP_MEDIA_BNCAUI;
+    tulip_media_set(sc, TULIP_MEDIA_AUIBNC);
     sc->tulip_cmdmode &= ~TULIP_CMD_FULLDUPLEX;
-    if ((sc->tulip_flags & TULIP_ALTPHYS) == 0)
-	sc->tulip_flags |= TULIP_PRINTMEDIA|TULIP_ALTPHYS;
-    sc->tulip_flags &= ~TULIP_ALTPHYS;
 }
 
 static const tulip_boardsw_t tulip_21040_boardsw = {
     TULIP_21040_GENERIC,
-    "",
     tulip_21040_media_probe,
-    tulip_21040_media_select,
-    NULL,
-    NULL
+    tulip_media_select,
+    tulip_media_poll,
 };
 
 static const tulip_boardsw_t tulip_21040_10baset_only_boardsw = {
     TULIP_21040_GENERIC,
-    "",
     tulip_21040_10baset_only_media_probe,
     tulip_21040_10baset_only_media_select,
     NULL,
-    NULL
 };
 
 static const tulip_boardsw_t tulip_21040_auibnc_only_boardsw = {
     TULIP_21040_GENERIC,
-    "",
     tulip_21040_auibnc_only_media_probe,
     tulip_21040_auibnc_only_media_select,
     NULL,
-    NULL
-};
-
-static const tulip_boardsw_t tulip_21040_zx314_master_boardsw = {
-    TULIP_21040_ZX314_MASTER,
-    "ZNYX ZX314 ",
-    tulip_21040_10baset_only_media_probe,
-    tulip_21040_10baset_only_media_select
-};
-
-static const tulip_boardsw_t tulip_21040_zx314_slave_boardsw = {
-    TULIP_21040_ZX314_SLAVE,
-    "ZNYX ZX314 ",
-    tulip_21040_10baset_only_media_probe,
-    tulip_21040_10baset_only_media_select
 };
 
-static const phy_attr_t tulip_phy_attrlist[] = {
-    { "NS DP83840", 0x20005c00, 0,	/* 08-00-17 */
-      {
-	{ 0x19, 0x40, 0x40 },	/* 10TX */
-	{ 0x19, 0x40, 0x00 },	/* 100TX */
-      }
-    },
-    { "Seeq 80C240", 0x0281F400, 0,	/* 00-A0-7D */
-      {
-	{ 0x12, 0x10, 0x00 },	/* 10T */
-	{ },			/* 100TX */
-	{ 0x12, 0x10, 0x10 },	/* 100T4 */
-	{ 0x12, 0x08, 0x08 },	/* FULL_DUPLEX */
-      }
-    },
-    { NULL }
-};
-
 static void
-tulip_21140_mii_probe(
+tulip_21041_mediainfo_init(
     tulip_softc_t * const sc)
 {
-    unsigned devaddr;
-
-    for (devaddr = 31; devaddr > 0; devaddr--) {
-	unsigned status = tulip_mii_readreg(sc, devaddr, PHYREG_STATUS);
-	unsigned media;
-	unsigned id;
-	const phy_attr_t *attr;
-	tulip_phy_t *phy;
-	const char *sep;
-	if (status == 0 || status == 0xFFFF || status < PHYSTS_10BASET)
-	    continue;
-	if ((status & PHYSTS_EXTENDED_REGS) == 0) {
-	    loudprintf(TULIP_PRINTF_FMT "(phy%d): skipping (no extended register set)\n",
-		   TULIP_PRINTF_ARGS, devaddr);
-	    continue;
-	}
-	id = (tulip_mii_readreg(sc, devaddr, PHYREG_IDLOW) << 16) |
-	    tulip_mii_readreg(sc, devaddr, PHYREG_IDHIGH);
-	for (attr = tulip_phy_attrlist; attr->attr_name != NULL; attr++) {
-	    if ((id & ~0x0F) == attr->attr_id)
-		break;
+    tulip_media_info_t * const mi = sc->tulip_mediainfo;
+
+#ifdef notyet
+    if (sc->tulip_revinfo >= 0x20) {
+	TULIP_MEDIAINFO_SIA_INIT(sc, &mi[0], 21041P2, 10BASET);
+	TULIP_MEDIAINFO_SIA_INIT(sc, &mi[1], 21041P2, 10BASET_FD);
+	TULIP_MEDIAINFO_SIA_INIT(sc, &mi[0], 21041P2, AUI);
+	TULIP_MEDIAINFO_SIA_INIT(sc, &mi[1], 21041P2, BNC);
+	return;
+    }
+#endif
+    TULIP_MEDIAINFO_SIA_INIT(sc, &mi[0], 21041, 10BASET);
+    TULIP_MEDIAINFO_SIA_INIT(sc, &mi[1], 21041, 10BASET_FD);
+    TULIP_MEDIAINFO_SIA_INIT(sc, &mi[2], 21041, AUI);
+    TULIP_MEDIAINFO_SIA_INIT(sc, &mi[3], 21041, BNC);
+}
+
+static void
+tulip_21041_media_probe(
+    tulip_softc_t * const sc)
+{
+    sc->tulip_if.if_baudrate = 10000000;
+    sc->tulip_cmdmode |= TULIP_CMD_CAPTREFFCT|TULIP_CMD_ENHCAPTEFFCT
+	|TULIP_CMD_THRSHLD160|TULIP_CMD_BACKOFFCTR;
+    sc->tulip_intrmask |= TULIP_STS_LINKPASS;
+    tulip_21041_mediainfo_init(sc);
+}
+
+static void
+tulip_21041_media_poll(
+    tulip_softc_t * const sc,
+    const tulip_mediapoll_event_t event)
+{
+    u_int32_t sia_status;
+
+#if defined(TULIP_DEBUG)
+    sc->tulip_dbg.dbg_events[event]++;
+#endif
+
+    if (event == TULIP_MEDIAPOLL_LINKFAIL) {
+	if (sc->tulip_probe_state != TULIP_PROBE_INACTIVE
+		|| !TULIP_DO_AUTOSENSE(sc))
+	    return;
+	sc->tulip_media = TULIP_MEDIA_UNKNOWN;
+	tulip_reset(sc);	/* start probe */
+	return;
+    }
+
+    /*
+     * If we've been been asked to start a poll or link change interrupt
+     * restart the probe (and reset the tulip to a known state).
+     */
+    if (event == TULIP_MEDIAPOLL_START) {
+	sc->tulip_if.if_flags |= IFF_OACTIVE;
+	sc->tulip_cmdmode &= ~(TULIP_CMD_FULLDUPLEX|TULIP_CMD_RXRUN);
+#ifdef notyet
+	if (sc->tulip_revinfo >= 0x20) {
+	    sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX;
+	    sc->tulip_flags |= TULIP_DIDNWAY;
 	}
-	if (attr->attr_name == NULL) {
-	    loudprintf(TULIP_PRINTF_FMT "(phy%d): skipping (unrecogized id 0x%08x)\n",
-		   TULIP_PRINTF_ARGS, devaddr, id & ~0x0F);
-	    continue;
+#endif
+	TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
+	sc->tulip_probe_state = TULIP_PROBE_MEDIATEST;
+	sc->tulip_probe_media = TULIP_MEDIA_10BASET;
+	sc->tulip_probe_timeout = TULIP_21041_PROBE_10BASET_TIMEOUT;
+	tulip_media_set(sc, TULIP_MEDIA_10BASET);
+	tulip_timeout(sc);
+	return;
+    }
+
+    if (sc->tulip_probe_state == TULIP_PROBE_INACTIVE)
+	return;
+
+    if (event == TULIP_MEDIAPOLL_TXPROBE_OK) {
+#if defined(TULIP_DEBUG)
+	sc->tulip_dbg.dbg_txprobes_ok[sc->tulip_probe_media]++;
+#endif
+	tulip_linkup(sc, sc->tulip_probe_media);
+	return;
+    }
+
+    sia_status = TULIP_CSR_READ(sc, csr_sia_status);
+    TULIP_CSR_WRITE(sc, csr_sia_status, sia_status);
+    if ((sia_status & TULIP_SIASTS_LINKFAIL) == 0) {
+	if (sc->tulip_revinfo >= 0x20) {
+	    if (sia_status & (PHYSTS_10BASET_FD << (16 - 6)))
+		sc->tulip_probe_media = TULIP_MEDIA_10BASET_FD;
 	}
+	/*
+	 * If the link has passed LinkPass, 10baseT is the
+	 * proper media to use.
+	 */
+	tulip_linkup(sc, sc->tulip_probe_media);
+	return;
+    }
 
-	MALLOC(phy, tulip_phy_t *, sizeof(tulip_phy_t), M_DEVBUF, M_NOWAIT);
-	if (phy == NULL) {
-	    loudprintf(TULIP_PRINTF_FMT "(phy%d): skipping (memory allocation failed)\n",
-		   TULIP_PRINTF_ARGS, devaddr);
-	    continue;
+    /*
+     * wait for up to 2.4 seconds for the link to reach pass state.
+     * Only then start scanning the other media for activity.
+     * choose media with receive activity over those without.
+     */
+    if (sc->tulip_probe_media == TULIP_MEDIA_10BASET) {
+	if (event != TULIP_MEDIAPOLL_TIMER)
+	    return;
+	if (sc->tulip_probe_timeout > 0
+		&& (sia_status & TULIP_SIASTS_OTHERRXACTIVITY) == 0) {
+	    tulip_timeout(sc);
+	    return;
+	}
+	sc->tulip_probe_timeout = TULIP_21041_PROBE_AUIBNC_TIMEOUT;
+	sc->tulip_flags |= TULIP_WANTRXACT;
+	if (sia_status & TULIP_SIASTS_OTHERRXACTIVITY) {
+	    sc->tulip_probe_media = TULIP_MEDIA_BNC;
+	} else {
+	    sc->tulip_probe_media = TULIP_MEDIA_AUI;
 	}
-	phy->phy_attr = attr;
-	phy->phy_devaddr = devaddr;
-	phy->phy_status = status;
-	phy->phy_next = sc->tulip_phys;
-	sc->tulip_phys = phy;
+	tulip_media_set(sc, sc->tulip_probe_media);
+	tulip_timeout(sc);
+	return;
+    }
 
-	loudprintf(TULIP_PRINTF_FMT "(phy%d): model = %s%s\n",
-	       TULIP_PRINTF_ARGS,
-	       phy->phy_devaddr, phy->phy_attr->attr_name,
-	       (phy->phy_status & PHYSTS_CAN_AUTONEG)
-	           ? " (supports media autonegotiation)"
-	           : "");
-	loudprintf(TULIP_PRINTF_FMT "(phy%d): media = ",
-	       TULIP_PRINTF_ARGS, phy->phy_devaddr);
-	for (media = 11, sep = ""; media < 16; media++) {
-	    if (status & (1 << media)) {
-		loudprintf("%s%s", sep, tulip_mediums[tulip_phy_statuses[media-11]]);
-		sep = ", ";
+    /*
+     * If we failed, clear the txprobe active flag.
+     */
+    if (event == TULIP_MEDIAPOLL_TXPROBE_FAILED)
+	sc->tulip_flags &= ~TULIP_TXPROBE_ACTIVE;
+
+
+    if (event == TULIP_MEDIAPOLL_TIMER) {
+	/*
+	 * If we've received something, then that's our link!
+	 */
+	if (sc->tulip_flags & TULIP_RXACT) {
+	    tulip_linkup(sc, sc->tulip_probe_media);
+	    return;
+	}
+	/*
+	 * if no txprobe active  
+	 */
+	if ((sc->tulip_flags & TULIP_TXPROBE_ACTIVE) == 0
+		&& ((sc->tulip_flags & TULIP_WANTRXACT) == 0
+		    || (sia_status & TULIP_SIASTS_RXACTIVITY))) {
+	    sc->tulip_probe_timeout = TULIP_21041_PROBE_AUIBNC_TIMEOUT;
+	    tulip_txprobe(sc);
+	    tulip_timeout(sc);
+	    return;
+	}
+	/*
+	 * Take 2 passes through before deciding to not
+	 * wait for receive activity.  Then take another
+	 * two passes before spitting out a warning.
+	 */
+	if (sc->tulip_probe_timeout <= 0) {
+	    if (sc->tulip_flags & TULIP_WANTRXACT) {
+		sc->tulip_flags &= ~TULIP_WANTRXACT;
+		sc->tulip_probe_timeout = TULIP_21041_PROBE_AUIBNC_TIMEOUT;
+	    } else {
+		printf(TULIP_PRINTF_FMT ": autosense failed: cable problem?\n",
+		       TULIP_PRINTF_ARGS);
+		if ((sc->tulip_if.if_flags & IFF_UP) == 0) {
+		    sc->tulip_if.if_flags &= ~IFF_RUNNING;
+		    sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
+		    return;
+		}
 	    }
 	}
-	loudprintf("\n");
     }
+    
+    /*
+     * Since this media failed to probe, try the other one.
+     */
+    sc->tulip_probe_timeout = TULIP_21041_PROBE_AUIBNC_TIMEOUT;
+    if (sc->tulip_probe_media == TULIP_MEDIA_AUI) {
+	sc->tulip_probe_media = TULIP_MEDIA_BNC;
+    } else {
+	sc->tulip_probe_media = TULIP_MEDIA_AUI;
+    }
+    tulip_media_set(sc, sc->tulip_probe_media);
+    sc->tulip_flags &= ~TULIP_TXPROBE_ACTIVE;
+    tulip_timeout(sc);
 }
+
+static const tulip_boardsw_t tulip_21041_boardsw = {
+    TULIP_21041_GENERIC,
+    tulip_21041_media_probe,
+    tulip_media_select,
+    tulip_21041_media_poll
+};
 
-/*
- * The general purpose timer of the 21140/21140a/21142 is kind
- * of strange.  It can run on one of 3 speeds depending on the mode
- * of the chip.
- *
- *	10Mb/s port	204.8  microseconds (also speed of 21041 timer)
- *	100Mb/s MII	 81.92 microseconds
- *	10Mb/s MII	819.2  microseconds
- *
- * So we use a tick of a 819.2 microseconds and bias the number of ticks
- * required based on the mode in which we are running.  2560/3125 = .8192
- * so we use the reciprocal to scale the ms delay to 21140 ticks.
- */
-static void
-tulip_21140_gp_timer_set(
-    tulip_softc_t * const sc,
-    unsigned msdelay)
-{
-    u_int32_t cmdmode = TULIP_CSR_READ(sc, csr_command);
-#ifdef TULIP_DEBUG
-    sc->tulip_dbg.dbg_msdelay = msdelay;
-#endif
-    if ((cmdmode & TULIP_CMD_PORTSELECT) == 0) {
-	msdelay *= 4;
-#ifdef TULIP_DEBUG
-	sc->tulip_dbg.dbg_gprate = TULIP_GPTMR_10MB_MII;
+static const tulip_phy_attr_t tulip_mii_phy_attrlist[] = {
+    { 0x20005c00, 0,		/* 08-00-17 */
+      {
+	{ 0x19, 0x0040, 0x0040 },	/* 10TX */
+	{ 0x19, 0x0040, 0x0000 },	/* 100TX */
+      },
+#if defined(TULIP_DEBUG)
+      "NS DP83840",
 #endif
-    } else if ((cmdmode & TULIP_CMD_TXTHRSHLDCTL) == 0) {
-	msdelay *= 10;
-#ifdef TULIP_DEBUG
-	sc->tulip_dbg.dbg_gprate = TULIP_GPTMR_100MB_MII;
-    } else {
-	sc->tulip_dbg.dbg_gprate = TULIP_GPTMR_10MB;
+    },
+    { 0x0281F400, 0,		/* 00-A0-7D */
+      {
+	{ 0x12, 0x0010, 0x0000 },	/* 10T */
+	{ },				/* 100TX */
+	{ 0x12, 0x0010, 0x0010 },	/* 100T4 */
+	{ 0x12, 0x0008, 0x0008 },	/* FULL_DUPLEX */
+      },
+#if defined(TULIP_DEBUG)
+      "Seeq 80C240"
 #endif
-    }
+    },
 #if 0
-    if (sc->tulip_chipid == TULIP_21140A)
-	msdelay *= 10;
+    { 0x0015F420, 0,	/* 00-A0-7D */
+      {
+	{ 0x12, 0x0010, 0x0000 },	/* 10T */
+	{ },				/* 100TX */
+	{ 0x12, 0x0010, 0x0010 },	/* 100T4 */
+	{ 0x12, 0x0008, 0x0008 },	/* FULL_DUPLEX */
+      },
+#if defined(TULIP_DEBUG)
+      "Broadcom BCM5000"
 #endif
-    TULIP_CSR_WRITE(sc, csr_status, TULIP_STS_GPTIMEOUT);
-    TULIP_CSR_WRITE(sc, csr_gp_timer, (msdelay * 313 + 128) / 256);
-    if (sc->tulip_flags & TULIP_DEVICEPROBE) {
-	sc->tulip_flags |= TULIP_FAKEGPTIMEOUT;
-    } else {
-	TULIP_CSR_WRITE(sc, csr_intr, sc->tulip_intrmask);
-	sc->tulip_flags &= ~TULIP_FAKEGPTIMEOUT;
-    }
-#ifdef TULIP_DEBUG
-    sc->tulip_dbg.dbg_gpticks = (msdelay * 313 + 128) / 256;
+    },
 #endif
+    { 0x0281F400, 0,		/* 00-A0-BE */
+      {
+	{ 0x11, 0x8000, 0x0000 },	/* 10T */
+	{ 0x11, 0x8000, 0x8000 },	/* 100TX */
+	{ },				/* 100T4 */
+	{ 0x11, 0x4000, 0x4000 },	/* FULL_DUPLEX */
+      },
+#if defined(TULIP_DEBUG)
+      "ICS 1890"
+#endif 
+    },
+    { 0 }
+};
+
+static tulip_media_t
+tulip_mii_phy_readspecific(
+    tulip_softc_t * const sc)
+{
+    const tulip_phy_attr_t *attr;
+    u_int16_t data;
+    u_int32_t id;
+    unsigned idx = 0;
+    static const tulip_media_t table[] = {
+	TULIP_MEDIA_UNKNOWN,
+	TULIP_MEDIA_10BASET,
+	TULIP_MEDIA_100BASETX,
+	TULIP_MEDIA_100BASET4,
+	TULIP_MEDIA_UNKNOWN,
+	TULIP_MEDIA_10BASET_FD,
+	TULIP_MEDIA_100BASETX_FD,
+	TULIP_MEDIA_UNKNOWN
+    };
+
+    /*
+     * Don't read phy specific registers if link is not up.
+     */
+    data = tulip_mii_readreg(sc, sc->tulip_phyaddr, PHYREG_STATUS);
+    if ((data & (PHYSTS_LINK_UP|PHYSTS_EXTENDED_REGS)) != (PHYSTS_LINK_UP|PHYSTS_EXTENDED_REGS))
+	return TULIP_MEDIA_UNKNOWN;
+
+    id = (tulip_mii_readreg(sc, sc->tulip_phyaddr, PHYREG_IDLOW) << 16) |
+	tulip_mii_readreg(sc, sc->tulip_phyaddr, PHYREG_IDHIGH);
+    for (attr = tulip_mii_phy_attrlist;; attr++) {
+	if (attr->attr_id == 0)
+	    return TULIP_MEDIA_UNKNOWN;
+	if ((id & ~0x0F) == attr->attr_id)
+	    break;
+    }
+
+    if (attr->attr_modes[PHY_MODE_100TX].pm_regno) {
+	const tulip_phy_modedata_t * const pm = &attr->attr_modes[PHY_MODE_100TX];
+	data = tulip_mii_readreg(sc, sc->tulip_phyaddr, pm->pm_regno);
+	if ((data & pm->pm_mask) == pm->pm_value)
+	    idx = 2;
+    }
+    if (idx == 0 && attr->attr_modes[PHY_MODE_100T4].pm_regno) {
+	const tulip_phy_modedata_t * const pm = &attr->attr_modes[PHY_MODE_100T4];
+	data = tulip_mii_readreg(sc, sc->tulip_phyaddr, pm->pm_regno);
+	if ((data & pm->pm_mask) == pm->pm_value)
+	    idx = 3;
+    }
+    if (idx == 0 && attr->attr_modes[PHY_MODE_10T].pm_regno) {
+	const tulip_phy_modedata_t * const pm = &attr->attr_modes[PHY_MODE_10T];
+	data = tulip_mii_readreg(sc, sc->tulip_phyaddr, pm->pm_regno);
+	if ((data & pm->pm_mask) == pm->pm_value)
+	    idx = 1;
+    } 
+    if (idx != 0 && attr->attr_modes[PHY_MODE_FULLDUPLEX].pm_regno) {
+	const tulip_phy_modedata_t * const pm = &attr->attr_modes[PHY_MODE_FULLDUPLEX];
+	data = tulip_mii_readreg(sc, sc->tulip_phyaddr, pm->pm_regno);
+	idx += ((data & pm->pm_mask) == pm->pm_value ? 4 : 0);
+    }
+    return table[idx];
 }
+
+static unsigned
+tulip_mii_get_phyaddr(
+    tulip_softc_t * const sc,
+    unsigned offset)
+{
+    unsigned phyaddr;
 
+    for (phyaddr = 1; phyaddr < 32; phyaddr++) {
+	unsigned status = tulip_mii_readreg(sc, phyaddr, PHYREG_STATUS);
+	if (status == 0 || status == 0xFFFF || status < PHYSTS_10BASET)
+	    continue;
+	if (offset == 0)
+	    return phyaddr;
+	offset--;
+    }
+    if (offset == 0) {
+	unsigned status = tulip_mii_readreg(sc, 0, PHYREG_STATUS);
+	if (status == 0 || status == 0xFFFF || status < PHYSTS_10BASET)
+	    return TULIP_MII_NOPHY;
+	return 0;
+    }
+    return TULIP_MII_NOPHY;
+}
+
 static int
-tulip_21140_map_abilities(
+tulip_mii_map_abilities(
     tulip_softc_t * const sc,
-    const tulip_phy_t * const phy,
     unsigned abilities)
 {
     sc->tulip_abilities = abilities;
     if (abilities & PHYSTS_100BASETX_FD) {
-	sc->tulip_media = TULIP_MEDIA_100BASETX_FD;
-    } else if (abilities & PHYSTS_100BASETX) {
-	sc->tulip_media = TULIP_MEDIA_100BASETX;
+	sc->tulip_probe_media = TULIP_MEDIA_100BASETX_FD;
     } else if (abilities & PHYSTS_100BASET4) {
-	sc->tulip_media = TULIP_MEDIA_100BASET4;
+	sc->tulip_probe_media = TULIP_MEDIA_100BASET4;
+    } else if (abilities & PHYSTS_100BASETX) {
+	sc->tulip_probe_media = TULIP_MEDIA_100BASETX;
     } else if (abilities & PHYSTS_10BASET_FD) {
-	sc->tulip_media = TULIP_MEDIA_10BASET_FD;
+	sc->tulip_probe_media = TULIP_MEDIA_10BASET_FD;
     } else if (abilities & PHYSTS_10BASET) {
-	sc->tulip_media = TULIP_MEDIA_10BASET;
+	sc->tulip_probe_media = TULIP_MEDIA_10BASET;
     } else {
-	sc->tulip_media = TULIP_MEDIA_UNKNOWN;
 	sc->tulip_probe_state = TULIP_PROBE_MEDIATEST;
-	return 1;
+	return 0;
     }
-    sc->tulip_intrmask &= ~TULIP_STS_GPTIMEOUT;
-    sc->tulip_flags &= ~TULIP_TXPROBE_ACTIVE;
-    sc->tulip_flags |= TULIP_PRINTMEDIA|TULIP_NEEDRESET;
     sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
-    return 0;
+    return 1;
 }
 
 static void
-tulip_21140_autonegotiate(
+tulip_mii_autonegotiate(
     tulip_softc_t * const sc,
-    const tulip_phy_t * const phy)
+    const unsigned phyaddr)
 {
-    u_int32_t data;
-
-    if (sc->tulip_flags & TULIP_INRESET) {
-	sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
-    }
-    if (sc->tulip_if.if_flags & IFF_NOAUTONEG) {
-	sc->tulip_probe_state = TULIP_PROBE_MEDIATEST;
-	data = tulip_mii_readreg(sc, phy->phy_devaddr, PHYREG_CONTROL);
-	if (data & PHYCTL_AUTONEG_ENABLE) {
-	    data &= ~PHYCTL_AUTONEG_ENABLE;
-	    tulip_mii_writereg(sc, phy->phy_devaddr, PHYREG_CONTROL, data);
-	}
-	return;
-    }
-
-  again:
     switch (sc->tulip_probe_state) {
+        case TULIP_PROBE_MEDIATEST:
         case TULIP_PROBE_INACTIVE: {
-	    sc->tulip_flags |= TULIP_TXPROBE_ACTIVE;
-	    tulip_mii_writereg(sc, phy->phy_devaddr, PHYREG_CONTROL, PHYCTL_RESET);
-	    sc->tulip_gpticks = 10;
-	    sc->tulip_intrmask |= TULIP_STS_ABNRMLINTR|TULIP_STS_GPTIMEOUT|TULIP_STS_NORMALINTR;
+	    sc->tulip_flags |= TULIP_DIDNWAY;
+	    tulip_mii_writereg(sc, phyaddr, PHYREG_CONTROL, PHYCTL_RESET);
+	    sc->tulip_probe_timeout = 3000;
+	    sc->tulip_intrmask |= TULIP_STS_ABNRMLINTR|TULIP_STS_NORMALINTR;
 	    sc->tulip_probe_state = TULIP_PROBE_PHYRESET;
-	    goto again;
+	    /* FALL THROUGH */
 	}
         case TULIP_PROBE_PHYRESET: {
-	    data = tulip_mii_readreg(sc, phy->phy_devaddr, PHYREG_CONTROL);
+	    u_int32_t status;
+	    u_int32_t data = tulip_mii_readreg(sc, phyaddr, PHYREG_CONTROL);
 	    if (data & PHYCTL_RESET) {
-		if (--sc->tulip_gpticks > 0) {
-		    tulip_21140_gp_timer_set(sc, 100);
+		if (sc->tulip_probe_timeout > 0) {
+		    tulip_timeout(sc);
 		    return;
 		}
 		printf(TULIP_PRINTF_FMT "(phy%d): error: reset of PHY never completed!\n",
-			   TULIP_PRINTF_ARGS, phy->phy_devaddr);
+			   TULIP_PRINTF_ARGS, phyaddr);
 		sc->tulip_flags &= ~TULIP_TXPROBE_ACTIVE;
 		sc->tulip_probe_state = TULIP_PROBE_FAILED;
 		sc->tulip_if.if_flags &= ~(IFF_UP|IFF_RUNNING);
-		sc->tulip_intrmask &= ~TULIP_STS_GPTIMEOUT;
 		return;
 	    }
-	    if ((phy->phy_status & PHYSTS_CAN_AUTONEG) == 0
-		    && (sc->tulip_if.if_flags & IFF_NOAUTONEG)) {
-#ifdef TULIP_DEBUG
+	    status = tulip_mii_readreg(sc, phyaddr, PHYREG_STATUS);
+	    if ((status & PHYSTS_CAN_AUTONEG) == 0) {
+#if defined(TULIP_DEBUG)
 		loudprintf(TULIP_PRINTF_FMT "(phy%d): autonegotiation disabled\n",
-			   TULIP_PRINTF_ARGS, phy->phy_devaddr);
+			   TULIP_PRINTF_ARGS, phyaddr);
 #endif
+		sc->tulip_flags &= ~TULIP_DIDNWAY;
 		sc->tulip_probe_state = TULIP_PROBE_MEDIATEST;
 		return;
 	    }
-	    if (tulip_mii_readreg(sc, phy->phy_devaddr, PHYREG_AUTONEG_ADVERTISEMENT) != ((phy->phy_status >> 6) | 0x01))
-		tulip_mii_writereg(sc, phy->phy_devaddr, PHYREG_AUTONEG_ADVERTISEMENT, (phy->phy_status >> 6) | 0x01);
-	    tulip_mii_writereg(sc, phy->phy_devaddr, PHYREG_CONTROL, data|PHYCTL_AUTONEG_RESTART|PHYCTL_AUTONEG_ENABLE);
-	    data = tulip_mii_readreg(sc, phy->phy_devaddr, PHYREG_CONTROL);
-#ifdef TULIP_DEBUG
+	    if (tulip_mii_readreg(sc, phyaddr, PHYREG_AUTONEG_ADVERTISEMENT) != ((status >> 6) | 0x01))
+		tulip_mii_writereg(sc, phyaddr, PHYREG_AUTONEG_ADVERTISEMENT, (status >> 6) | 0x01);
+	    tulip_mii_writereg(sc, phyaddr, PHYREG_CONTROL, data|PHYCTL_AUTONEG_RESTART|PHYCTL_AUTONEG_ENABLE);
+	    data = tulip_mii_readreg(sc, phyaddr, PHYREG_CONTROL);
+#if defined(TULIP_DEBUG)
 	    if ((data & PHYCTL_AUTONEG_ENABLE) == 0)
 		loudprintf(TULIP_PRINTF_FMT "(phy%d): oops: enable autonegotiation failed: 0x%04x\n",
-			   TULIP_PRINTF_ARGS, phy->phy_devaddr, data);
+			   TULIP_PRINTF_ARGS, phyaddr, data);
 	    else
 		loudprintf(TULIP_PRINTF_FMT "(phy%d): autonegotiation restarted: 0x%04x\n",
-			   TULIP_PRINTF_ARGS, phy->phy_devaddr, data);
+			   TULIP_PRINTF_ARGS, phyaddr, data);
+	    sc->tulip_dbg.dbg_nway_starts++;
 #endif
 	    sc->tulip_probe_state = TULIP_PROBE_PHYAUTONEG;
-	    sc->tulip_gpticks = 60;
-	    goto again;
+	    sc->tulip_probe_timeout = 3000;
+	    /* FALL THROUGH */
 	}
         case TULIP_PROBE_PHYAUTONEG: {
-	    data = tulip_mii_readreg(sc, phy->phy_devaddr, PHYREG_STATUS);
-	    if ((data & PHYSTS_AUTONEG_DONE) == 0) {
-		if (--sc->tulip_gpticks > 0) {
-		    tulip_21140_gp_timer_set(sc, 100);
+	    u_int32_t status = tulip_mii_readreg(sc, phyaddr, PHYREG_STATUS);
+	    u_int32_t data;
+	    if ((status & PHYSTS_AUTONEG_DONE) == 0) {
+		if (sc->tulip_probe_timeout > 0) {
+		    tulip_timeout(sc);
 		    return;
 		}
-#ifdef TULIP_DEBUG
+#if defined(TULIP_DEBUG)
 		loudprintf(TULIP_PRINTF_FMT "(phy%d): autonegotiation timeout: sts=0x%04x, ctl=0x%04x\n",
-			   TULIP_PRINTF_ARGS, phy->phy_devaddr, data,
-			   tulip_mii_readreg(sc, phy->phy_devaddr, PHYREG_CONTROL));
+			   TULIP_PRINTF_ARGS, phyaddr, status,
+			   tulip_mii_readreg(sc, phyaddr, PHYREG_CONTROL));
 #endif
+		sc->tulip_flags &= ~TULIP_DIDNWAY;
 		sc->tulip_probe_state = TULIP_PROBE_MEDIATEST;
 		return;
 	    }
-	    data = tulip_mii_readreg(sc, phy->phy_devaddr, PHYREG_AUTONEG_ABILITIES);
-#ifdef TULIP_DEBUG
+	    data = tulip_mii_readreg(sc, phyaddr, PHYREG_AUTONEG_ABILITIES);
+#if defined(TULIP_DEBUG)
 	    loudprintf(TULIP_PRINTF_FMT "(phy%d): autonegotiation complete: 0x%04x\n",
-		       TULIP_PRINTF_ARGS, phy->phy_devaddr, data);
+		       TULIP_PRINTF_ARGS, phyaddr, data);
 #endif
-	    data = (data << 6) & phy->phy_status;
-	    tulip_21140_map_abilities(sc, phy, data);
+	    data = (data << 6) & status;
+	    if (!tulip_mii_map_abilities(sc, data))
+		sc->tulip_flags &= ~TULIP_DIDNWAY;
 	    return;
 	}
+	default: {
+#if defined(DIAGNOSTIC)
+	    panic("tulip_media_poll: botch at line %d\n", __LINE__);
+#endif
+	    break;
+	}
     }
-#ifdef TULIP_DEBUG
+#if defined(TULIP_DEBUG)
     loudprintf(TULIP_PRINTF_FMT "(phy%d): autonegotiation failure: state = %d\n",
-	       TULIP_PRINTF_ARGS, phy->phy_devaddr, sc->tulip_probe_state);
+	       TULIP_PRINTF_ARGS, phyaddr, sc->tulip_probe_state);
+	    sc->tulip_dbg.dbg_nway_failures++;
 #endif
 }
 
-static tulip_media_t
-tulip_21140_phy_readspecific(
-    tulip_softc_t * const sc,
-    const tulip_phy_t * const phy)
-{
-    const phy_attr_t * const attr = phy->phy_attr;
-    unsigned data;
-    unsigned idx = 0;
-    static const tulip_media_t table[] = {
-	TULIP_MEDIA_UNKNOWN,
-	TULIP_MEDIA_10BASET,
-	TULIP_MEDIA_100BASETX,
-	TULIP_MEDIA_100BASET4,
-	TULIP_MEDIA_UNKNOWN,
-	TULIP_MEDIA_10BASET_FD,
-	TULIP_MEDIA_100BASETX_FD,
-	TULIP_MEDIA_UNKNOWN
-    };
-
-    /*
-     * Don't read phy specific registers if link is not up.
-     */
-    data = tulip_mii_readreg(sc, phy->phy_devaddr, PHYREG_STATUS);
-    if ((data & PHYSTS_LINK_UP) == 0)
-	return TULIP_MEDIA_UNKNOWN;
-
-    if (attr->attr_modes[PHY_MODE_100TX].pm_regno) {
-	const phy_modedata_t * const pm = &attr->attr_modes[PHY_MODE_100TX];
-	data = tulip_mii_readreg(sc, phy->phy_devaddr, pm->pm_regno);
-	if ((data & pm->pm_mask) == pm->pm_value)
-	    idx = 2;
-    }
-    if (idx == 0 && attr->attr_modes[PHY_MODE_100T4].pm_regno) {
-	const phy_modedata_t * const pm = &attr->attr_modes[PHY_MODE_100T4];
-	data = tulip_mii_readreg(sc, phy->phy_devaddr, pm->pm_regno);
-	if ((data & pm->pm_mask) == pm->pm_value)
-	    idx = 3;
-    }
-    if (idx == 0 && attr->attr_modes[PHY_MODE_10T].pm_regno) {
-	const phy_modedata_t * const pm = &attr->attr_modes[PHY_MODE_10T];
-	data = tulip_mii_readreg(sc, phy->phy_devaddr, pm->pm_regno);
-	if ((data & pm->pm_mask) == pm->pm_value)
-	    idx = 1;
-    } 
-    if (idx != 0 && attr->attr_modes[PHY_MODE_FULLDUPLEX].pm_regno) {
-	const phy_modedata_t * const pm = &attr->attr_modes[PHY_MODE_FULLDUPLEX];
-	data = tulip_mii_readreg(sc, phy->phy_devaddr, pm->pm_regno);
-	idx += ((data & pm->pm_mask) == pm->pm_value ? 4 : 0);
-    }
-    return table[idx];
-}
-
 static void
-tulip_21140_mii_link_monitor(
-    tulip_softc_t * const sc,
-    const tulip_phy_t * const phy)
+tulip_2114x_media_preset(
+    tulip_softc_t * const sc)
 {
-    u_int32_t data;
+    const tulip_media_info_t *mi = NULL;
+    tulip_media_t media = sc->tulip_media;
 
-    tulip_21140_gp_timer_set(sc, 425);
-    /*
-     * Have we seen some packets?  If so, the link must be good.
-     */
-    if ((sc->tulip_flags & (TULIP_RXACT|TULIP_LINKSUSPECT|TULIP_LINKUP)) == (TULIP_RXACT|TULIP_LINKUP)) {
-	sc->tulip_flags &= ~TULIP_RXACT;
-	return;
-    }
-
-    /*
-     * Read the PHY status register.
-     */
-    data = tulip_mii_readreg(sc, phy->phy_devaddr, PHYREG_STATUS);
-    if ((sc->tulip_if.if_flags & IFF_NOAUTONEG) == 0 && (data & PHYSTS_AUTONEG_DONE)) {
-	/*
-	 * If autonegotiation hasn't been disabled and the PHY has complete 
-	 * autonegotiation, see the if the remote systems abilities have changed.
-	 * If so, upgrade or downgrade as appropriate.
-	 */
-	unsigned abilities = tulip_mii_readreg(sc, phy->phy_devaddr, PHYREG_AUTONEG_ABILITIES);
-	abilities = (abilities << 6) & phy->phy_status;
-	if (abilities != sc->tulip_abilities) {
-	    sc->tulip_flags |= TULIP_PRINTMEDIA;
-#ifdef TULIP_DEBUG
-	    loudprintf(TULIP_PRINTF_FMT "(phy%d): autonegotiation changed: 0x%04x -> 0x%04x\n",
-		       TULIP_PRINTF_ARGS, phy->phy_devaddr,
-		       sc->tulip_abilities, abilities);
-#endif
-	    tulip_21140_map_abilities(sc, phy, abilities);
-	    return;
-	}
-    }
-    /*
-     * The link is now up.  If was down, say its back up.
-     */
-    if ((data & (PHYSTS_LINK_UP|PHYSTS_REMOTE_FAULT)) == PHYSTS_LINK_UP) {
-	if ((sc->tulip_if.if_flags & IFF_NOAUTONEG) == 0) {
-	    tulip_media_t media = tulip_21140_phy_readspecific(sc, phy);
-	    if (media != sc->tulip_media && media != TULIP_MEDIA_UNKNOWN) {
-		sc->tulip_media = media;
-		sc->tulip_flags |= TULIP_PRINTMEDIA;
+    if (sc->tulip_probe_state == TULIP_PROBE_INACTIVE)
+	media = sc->tulip_media;
+    else
+	media = sc->tulip_probe_media;
+    
+    sc->tulip_cmdmode &= ~TULIP_CMD_PORTSELECT;
+    sc->tulip_flags &= ~TULIP_SQETEST;
+    if (media != TULIP_MEDIA_UNKNOWN) {
+#if defined(TULIP_DEBUG)
+	if (media < TULIP_MEDIA_MAX && sc->tulip_mediums[media] != NULL) {
+#endif
+	    mi = sc->tulip_mediums[media];
+	    if (mi->mi_type == TULIP_MEDIAINFO_MII) {
+		sc->tulip_cmdmode |= TULIP_CMD_PORTSELECT;
+	    } else if (mi->mi_type == TULIP_MEDIAINFO_GPR
+		       || mi->mi_type == TULIP_MEDIAINFO_SYM) {
+		sc->tulip_cmdmode &= ~TULIP_GPR_CMDBITS;
+		sc->tulip_cmdmode |= mi->mi_cmdmode;
+	    } else if (mi->mi_type == TULIP_MEDIAINFO_SIA) {
+		TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
 	    }
+#if defined(TULIP_DEBUG)
+	} else {
+	    printf(TULIP_PRINTF_FMT ": preset: bad media %d!\n",
+		   TULIP_PRINTF_ARGS, media);
 	}
-	sc->tulip_gpticks = 0;
-	if (sc->tulip_flags & TULIP_PRINTMEDIA) {
-	    printf(TULIP_PRINTF_FMT ": %senabling %s port\n",
-		   TULIP_PRINTF_ARGS,
-		   (sc->tulip_flags & TULIP_LINKUP) ? "" : "link up: ",
-		   tulip_mediums[sc->tulip_media]);
-	} else if ((sc->tulip_flags & TULIP_LINKUP) == 0) {
-	    printf(TULIP_PRINTF_FMT ": link up\n", TULIP_PRINTF_ARGS);
-	}
-	sc->tulip_flags &= ~(TULIP_PRINTMEDIA|TULIP_LINKSUSPECT|TULIP_RXACT);
-	sc->tulip_flags |= TULIP_LINKUP;
-	return;
-    }
-    /*
-     * The link may be down.  Mark it as suspect.  If suspect for 12 ticks,
-     * mark it down.  If autonegotiation is not disabled, restart the media
-     * probe to see if the media has changed.
-     */
-    if ((sc->tulip_flags & TULIP_LINKSUSPECT) == 0) {
-	sc->tulip_flags |= TULIP_LINKSUSPECT;
-	sc->tulip_flags &= ~TULIP_LINKUP;
-	sc->tulip_gpticks = 12;
-#ifdef TULIP_DEBUG
-	sc->tulip_dbg.dbg_link_suspected++;
 #endif
-	return;
     }
-    if (--sc->tulip_gpticks > 0)
-	return;
-    if (sc->tulip_flags & TULIP_LINKSUSPECT) {
-	printf(TULIP_PRINTF_FMT ": link down: cable problem?\n", TULIP_PRINTF_ARGS);
-	sc->tulip_flags &= ~TULIP_LINKSUSPECT;
-#ifdef TULIP_DEBUG
-	sc->tulip_dbg.dbg_link_downed++;
-#endif
-    }
-    if (sc->tulip_if.if_flags & IFF_NOAUTONEG)
-	return;
-    sc->tulip_media = TULIP_MEDIA_UNKNOWN;
-    sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
-    tulip_21140_autonegotiate(sc, phy);
-}
-
-static void
-tulip_21140_nomii_media_preset(
-    tulip_softc_t * const sc)
-{
-    sc->tulip_flags &= ~TULIP_SQETEST;
-    if (sc->tulip_if.if_flags & IFF_ALTPHYS) {
-	sc->tulip_cmdmode |= TULIP_CMD_PORTSELECT
-	    |TULIP_CMD_PCSFUNCTION|TULIP_CMD_SCRAMBLER;
-	sc->tulip_if.if_baudrate = 100000000;
-    } else {
-	sc->tulip_cmdmode &= ~(TULIP_CMD_PORTSELECT
-			       |TULIP_CMD_PCSFUNCTION|TULIP_CMD_SCRAMBLER);
-	sc->tulip_if.if_baudrate = 10000000;
-	if ((sc->tulip_cmdmode & TULIP_CMD_FULLDUPLEX) == 0)
+    switch (media) {
+	case TULIP_MEDIA_BNC:
+	case TULIP_MEDIA_AUI:
+	case TULIP_MEDIA_10BASET: {
+	    sc->tulip_cmdmode &= ~TULIP_CMD_FULLDUPLEX;
+	    sc->tulip_cmdmode |= TULIP_CMD_TXTHRSHLDCTL;
+	    sc->tulip_if.if_baudrate = 10000000;
 	    sc->tulip_flags |= TULIP_SQETEST;
+	    break;
+	}
+	case TULIP_MEDIA_10BASET_FD: {
+	    sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX|TULIP_CMD_TXTHRSHLDCTL;
+	    sc->tulip_if.if_baudrate = 10000000;
+	    break;
+	}
+	case TULIP_MEDIA_100BASEFX:
+	case TULIP_MEDIA_100BASET4:
+	case TULIP_MEDIA_100BASETX: {
+	    sc->tulip_cmdmode &= ~(TULIP_CMD_FULLDUPLEX|TULIP_CMD_TXTHRSHLDCTL);
+	    sc->tulip_cmdmode |= TULIP_CMD_PORTSELECT;
+	    sc->tulip_if.if_baudrate = 100000000;
+	    break;
+	}
+	case TULIP_MEDIA_100BASEFX_FD:
+	case TULIP_MEDIA_100BASETX_FD: {
+	    sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX|TULIP_CMD_PORTSELECT;
+	    sc->tulip_cmdmode &= ~TULIP_CMD_TXTHRSHLDCTL;
+	    sc->tulip_if.if_baudrate = 100000000;
+	    break;
+	}
+	default: {
+	    break;
+	}
     }
     TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
 }
-
+
+/*
+ ********************************************************************
+ *  Start of 21140/21140A support which does not use the MII interface 
+ */
+
 static void
-tulip_21140_mii_media_preset(
-    tulip_softc_t * const sc)
+tulip_null_media_poll(
+    tulip_softc_t * const sc,
+    tulip_mediapoll_event_t event)
 {
-    sc->tulip_cmdmode |= TULIP_CMD_PORTSELECT;
-    sc->tulip_flags &= ~TULIP_SQETEST;
-    if (sc->tulip_media != TULIP_MEDIA_UNKNOWN) {
-	switch (sc->tulip_media) {
-	    case TULIP_MEDIA_10BASET: {
-		sc->tulip_cmdmode &= ~TULIP_CMD_FULLDUPLEX;
-		sc->tulip_cmdmode |= TULIP_CMD_TXTHRSHLDCTL;
-		sc->tulip_if.if_baudrate = 10000000;
-		sc->tulip_flags |= TULIP_SQETEST;
-		break;
-	    }
-	    case TULIP_MEDIA_10BASET_FD: {
-		sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX|TULIP_CMD_TXTHRSHLDCTL;
-		sc->tulip_if.if_baudrate = 10000000;
-		break;
-	    }
-	    case TULIP_MEDIA_100BASET4:
-	    case TULIP_MEDIA_100BASETX: {
-		sc->tulip_cmdmode &= ~(TULIP_CMD_FULLDUPLEX|TULIP_CMD_TXTHRSHLDCTL);
-		sc->tulip_if.if_baudrate = 100000000;
-		break;
-	    }
-	    case TULIP_MEDIA_100BASETX_FD: {
-		sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX;
-		sc->tulip_cmdmode &= ~TULIP_CMD_TXTHRSHLDCTL;
-		sc->tulip_if.if_baudrate = 100000000;
-		break;
-	    }
-	}
-    }
-    TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
+#if defined(TULIP_DEBUG)
+    sc->tulip_dbg.dbg_events[event]++;
+#endif
+#if defined(DIAGNOSTIC)
+    printf(TULIP_PRINTF_FMT ": botch(media_poll) at line %d\n",
+	   TULIP_PRINTF_ARGS, __LINE__);
+#endif
 }
 
-static void
-tulip_21140_nomii_100only_media_preset(
-    tulip_softc_t * const sc)
+__inline__ static void
+tulip_21140_mediainit(
+    tulip_softc_t * const sc,
+    tulip_media_info_t * const mip,
+    tulip_media_t const media,
+    unsigned gpdata,
+    unsigned cmdmode)
 {
-    sc->tulip_cmdmode |= TULIP_CMD_PORTSELECT
-	|TULIP_CMD_PCSFUNCTION|TULIP_CMD_SCRAMBLER;
-    TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
+    sc->tulip_mediums[media] = mip;
+    mip->mi_type = TULIP_MEDIAINFO_GPR;
+    mip->mi_cmdmode = cmdmode;
+    mip->mi_gpdata = gpdata;
 }
-
 
-static int
+static void
 tulip_21140_evalboard_media_probe(
     tulip_softc_t * const sc)
 {
+    tulip_media_info_t *mip = sc->tulip_mediainfo;
+
+    sc->tulip_gpinit = TULIP_GP_EB_PINS;
+    sc->tulip_gpdata = TULIP_GP_EB_INIT;
     TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EB_PINS);
     TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EB_INIT);
     TULIP_CSR_WRITE(sc, csr_command,
@@ -1446,51 +1575,42 @@ tulip_21140_evalboard_media_probe(
     TULIP_CSR_WRITE(sc, csr_command,
 	TULIP_CSR_READ(sc, csr_command) & ~TULIP_CMD_TXTHRSHLDCTL);
     DELAY(1000000);
-    return (TULIP_CSR_READ(sc, csr_gp) & TULIP_GP_EB_OK100) != 0;
-}
-
-static void
-tulip_21140_evalboard_media_select(
-    tulip_softc_t * const sc)
-{
-    sc->tulip_cmdmode |= TULIP_CMD_STOREFWD|TULIP_CMD_MUSTBEONE
-	|TULIP_CMD_BACKOFFCTR;
-    sc->tulip_flags |= TULIP_LINKUP;
-    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EB_PINS);
-    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EB_INIT);
-    if (sc->tulip_if.if_flags & IFF_ALTPHYS) {
-	if ((sc->tulip_flags & TULIP_ALTPHYS) == 0)
-	    sc->tulip_flags |= TULIP_PRINTMEDIA|TULIP_ALTPHYS;
-	sc->tulip_cmdmode &= ~TULIP_CMD_TXTHRSHLDCTL;
-	sc->tulip_media = TULIP_MEDIA_100BASETX;
-	sc->tulip_flags &= ~TULIP_SQETEST;
-    } else {
-	if (sc->tulip_flags & TULIP_ALTPHYS)
-	    sc->tulip_flags ^= TULIP_PRINTMEDIA|TULIP_ALTPHYS;
-	sc->tulip_cmdmode |= TULIP_CMD_TXTHRSHLDCTL;
+    if ((TULIP_CSR_READ(sc, csr_gp) & TULIP_GP_EB_OK100) != 0) {
 	sc->tulip_media = TULIP_MEDIA_10BASET;
-	sc->tulip_flags |= TULIP_SQETEST;
-    }
-#ifdef BIG_PACKET
-    if (sc->tulip_if.if_mtu > ETHERMTU) {
-	TULIP_CSR_WRITE(sc, csr_watchdog, TULIP_WATCHDOG_RXDISABLE|TULIP_WATCHDOG_TXDISABLE);
+    } else {
+	sc->tulip_media = TULIP_MEDIA_100BASETX;
     }
-#endif
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_10BASET,
+			  TULIP_GP_EB_INIT,
+			  TULIP_CMD_TXTHRSHLDCTL);
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_10BASET_FD,
+			  TULIP_GP_EB_INIT,
+			  TULIP_CMD_TXTHRSHLDCTL|TULIP_CMD_FULLDUPLEX);
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_100BASETX,
+			  TULIP_GP_EB_INIT,
+			  TULIP_CMD_PORTSELECT|TULIP_CMD_PCSFUNCTION
+			      |TULIP_CMD_SCRAMBLER);
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_100BASETX_FD,
+			  TULIP_GP_EB_INIT,
+			  TULIP_CMD_PORTSELECT|TULIP_CMD_PCSFUNCTION
+			      |TULIP_CMD_SCRAMBLER|TULIP_CMD_FULLDUPLEX);
 }
 
 static const tulip_boardsw_t tulip_21140_eb_boardsw = {
     TULIP_21140_DEC_EB,
-    "",
     tulip_21140_evalboard_media_probe,
-    tulip_21140_evalboard_media_select,
-    tulip_21140_nomii_media_preset,
+    tulip_media_select,
+    tulip_null_media_poll,
+    tulip_2114x_media_preset,
 };
 
-static int
+static void
 tulip_21140_smc9332_media_probe(
     tulip_softc_t * const sc)
 {
+    tulip_media_info_t *mip = sc->tulip_mediainfo;
     int idx, cnt = 0;
+
     TULIP_CSR_WRITE(sc, csr_command, TULIP_CMD_PORTSELECT|TULIP_CMD_MUSTBEONE);
     TULIP_CSR_WRITE(sc, csr_busmode, TULIP_BUSMODE_SWRESET);
     DELAY(10);	/* Wait 10 microseconds (actually 50 PCI cycles but at 
@@ -1498,7 +1618,9 @@ tulip_21140_smc9332_media_probe(
 		   bit longer anyways) */
     TULIP_CSR_WRITE(sc, csr_command, TULIP_CMD_PORTSELECT |
 	TULIP_CMD_PCSFUNCTION | TULIP_CMD_SCRAMBLER | TULIP_CMD_MUSTBEONE);
-    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_SMC_9332_PINS);
+    sc->tulip_gpinit = TULIP_GP_SMC_9332_PINS;
+    sc->tulip_gpdata = TULIP_GP_SMC_9332_INIT;
+    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_SMC_9332_PINS|TULIP_GP_PINSET);
     TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_SMC_9332_INIT);
     DELAY(200000);
     for (idx = 1000; idx > 0; idx--) {
@@ -1513,59 +1635,39 @@ tulip_21140_smc9332_media_probe(
 	}
 	DELAY(1000);
     }
-    return cnt > 100;
+    sc->tulip_media = cnt > 100 ? TULIP_MEDIA_100BASETX : TULIP_MEDIA_10BASET;
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_100BASETX,
+			  TULIP_GP_SMC_9332_INIT,
+			  TULIP_CMD_PORTSELECT|TULIP_CMD_PCSFUNCTION
+			      |TULIP_CMD_SCRAMBLER);
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_100BASETX_FD,
+			  TULIP_GP_SMC_9332_INIT,
+			  TULIP_CMD_PORTSELECT|TULIP_CMD_PCSFUNCTION
+			      |TULIP_CMD_SCRAMBLER|TULIP_CMD_FULLDUPLEX);
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_10BASET,
+			  TULIP_GP_SMC_9332_INIT,
+			  TULIP_CMD_TXTHRSHLDCTL);
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_10BASET_FD,
+			  TULIP_GP_SMC_9332_INIT,
+			  TULIP_CMD_TXTHRSHLDCTL|TULIP_CMD_FULLDUPLEX);
 }
  
-static void
-tulip_21140_smc9332_media_select(
-    tulip_softc_t * const sc)
-{
-    sc->tulip_cmdmode |= TULIP_CMD_STOREFWD|TULIP_CMD_MUSTBEONE
-	|TULIP_CMD_BACKOFFCTR;
-    sc->tulip_flags |= TULIP_LINKUP;
-    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_SMC_9332_PINS);
-    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_SMC_9332_INIT);
-    if (sc->tulip_if.if_flags & IFF_ALTPHYS) {
-	if ((sc->tulip_flags & TULIP_ALTPHYS) == 0)
-	    sc->tulip_flags |= TULIP_PRINTMEDIA|TULIP_ALTPHYS;
-	sc->tulip_cmdmode &= ~TULIP_CMD_TXTHRSHLDCTL;
-	sc->tulip_media = TULIP_MEDIA_100BASETX;
-	sc->tulip_flags &= ~TULIP_SQETEST;
-    } else {
-	if (sc->tulip_flags & TULIP_ALTPHYS)
-	    sc->tulip_flags ^= TULIP_PRINTMEDIA|TULIP_ALTPHYS;
-	sc->tulip_cmdmode |= TULIP_CMD_TXTHRSHLDCTL;
-	sc->tulip_media = TULIP_MEDIA_10BASET;
-	sc->tulip_flags |= TULIP_SQETEST;
-    }
-#ifdef BIG_PACKET
-    if (sc->tulip_if.if_mtu > ETHERMTU) {
-	TULIP_CSR_WRITE(sc, csr_watchdog, TULIP_WATCHDOG_RXDISABLE|TULIP_WATCHDOG_TXDISABLE);
-    }
-#endif
-}
-
 static const tulip_boardsw_t tulip_21140_smc9332_boardsw = {
     TULIP_21140_SMC_9332,
-    "SMC 9332 ",
-    tulip_21140_smc9332_media_probe,
-    tulip_21140_smc9332_media_select,
-    tulip_21140_nomii_media_preset,
-};
-
-static const tulip_boardsw_t tulip_21140A_smc9332bdt_boardsw = {
-    TULIP_21140A_SMC_9332BDT,
-    "SMC 9332BDT ",
     tulip_21140_smc9332_media_probe,
-    tulip_21140_mii_media_preset,
-    tulip_21140_mii_probe,
+    tulip_media_select,
+    tulip_null_media_poll,
+    tulip_2114x_media_preset,
 };
-
 
-static int
+static void
 tulip_21140_cogent_em100_media_probe(
     tulip_softc_t * const sc)
 {
+    tulip_media_info_t *mip = sc->tulip_mediainfo;
+
+    sc->tulip_gpinit = TULIP_GP_EM100_PINS;
+    sc->tulip_gpdata = TULIP_GP_EM100_INIT;
     TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EM100_PINS);
     TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EM100_INIT);
     TULIP_CSR_WRITE(sc, csr_command,
@@ -1573,42 +1675,35 @@ tulip_21140_cogent_em100_media_probe(
 	TULIP_CMD_PCSFUNCTION | TULIP_CMD_SCRAMBLER | TULIP_CMD_MUSTBEONE);
     TULIP_CSR_WRITE(sc, csr_command,
 	TULIP_CSR_READ(sc, csr_command) & ~TULIP_CMD_TXTHRSHLDCTL);
-    return 1;
-}
-
-static void
-tulip_21140_cogent_em100_media_select(
-    tulip_softc_t * const sc)
-{
-    sc->tulip_cmdmode |= TULIP_CMD_STOREFWD|TULIP_CMD_MUSTBEONE
-	|TULIP_CMD_BACKOFFCTR;
-    sc->tulip_flags |= TULIP_LINKUP;
-    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EM100_PINS);
-    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EM100_INIT);
-    if ((sc->tulip_flags & TULIP_ALTPHYS) == 0)
-	sc->tulip_flags |= TULIP_PRINTMEDIA|TULIP_ALTPHYS;
-    sc->tulip_cmdmode &= ~TULIP_CMD_TXTHRSHLDCTL;
     sc->tulip_media = TULIP_MEDIA_100BASETX;
-#ifdef BIG_PACKET
-    if (sc->tulip_if.if_mtu > ETHERMTU) {
-	TULIP_CSR_WRITE(sc, csr_watchdog, TULIP_WATCHDOG_RXDISABLE|TULIP_WATCHDOG_TXDISABLE);
-    }
-#endif
+
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_100BASETX,
+			  TULIP_GP_EM100_INIT,
+			  TULIP_CMD_PORTSELECT|TULIP_CMD_PCSFUNCTION
+			      |TULIP_CMD_SCRAMBLER);
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_100BASETX_FD,
+			  TULIP_GP_EM100_INIT,
+			  TULIP_CMD_PORTSELECT|TULIP_CMD_PCSFUNCTION
+			      |TULIP_CMD_SCRAMBLER|TULIP_CMD_FULLDUPLEX);
 }
 
 static const tulip_boardsw_t tulip_21140_cogent_em100_boardsw = {
     TULIP_21140_COGENT_EM100,
-    "Cogent EM100 ",
     tulip_21140_cogent_em100_media_probe,
-    tulip_21140_cogent_em100_media_select,
-    tulip_21140_nomii_100only_media_preset
+    tulip_media_select,
+    tulip_null_media_poll,
+    tulip_2114x_media_preset
 };
 
-
-static int
+static void
 tulip_21140_znyx_zx34x_media_probe(
     tulip_softc_t * const sc)
 {
+    tulip_media_info_t *mip = sc->tulip_mediainfo;
+    int cnt10 = 0, cnt100 = 0, idx;
+
+    sc->tulip_gpinit = TULIP_GP_ZX34X_PINS;
+    sc->tulip_gpdata = TULIP_GP_ZX34X_INIT;
     TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_ZX34X_PINS);
     TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_ZX34X_INIT);
     TULIP_CSR_WRITE(sc, csr_command,
@@ -1616,479 +1711,1338 @@ tulip_21140_znyx_zx34x_media_probe(
 	TULIP_CMD_PCSFUNCTION | TULIP_CMD_SCRAMBLER | TULIP_CMD_MUSTBEONE);
     TULIP_CSR_WRITE(sc, csr_command,
 	TULIP_CSR_READ(sc, csr_command) & ~TULIP_CMD_TXTHRSHLDCTL);
-    DELAY(1000000);
 
-    return (TULIP_CSR_READ(sc, csr_gp) & TULIP_GP_ZX34X_OK10);
+    DELAY(200000);
+    for (idx = 1000; idx > 0; idx--) {
+	u_int32_t csr = TULIP_CSR_READ(sc, csr_gp);
+	if ((csr & (TULIP_GP_ZX34X_LNKFAIL|TULIP_GP_ZX34X_SYMDET|TULIP_GP_ZX34X_SIGDET)) == (TULIP_GP_ZX34X_LNKFAIL|TULIP_GP_ZX34X_SYMDET|TULIP_GP_ZX34X_SIGDET)) {
+	    if (++cnt100 > 100)
+		break;
+	} else if ((csr & TULIP_GP_ZX34X_LNKFAIL) == 0) {
+	    if (++cnt10 > 100)
+		break;
+	} else {
+	    cnt10 = 0;
+	    cnt100 = 0;
+	}
+	DELAY(1000);
+    }
+    sc->tulip_media = cnt100 > 100 ? TULIP_MEDIA_100BASETX : TULIP_MEDIA_10BASET;
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_10BASET,
+			  TULIP_GP_ZX34X_INIT,
+			  TULIP_CMD_TXTHRSHLDCTL);
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_10BASET_FD,
+			  TULIP_GP_ZX34X_INIT,
+			  TULIP_CMD_TXTHRSHLDCTL|TULIP_CMD_FULLDUPLEX);
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_100BASETX,
+			  TULIP_GP_ZX34X_INIT,
+			  TULIP_CMD_PORTSELECT|TULIP_CMD_PCSFUNCTION
+			      |TULIP_CMD_SCRAMBLER);
+    tulip_21140_mediainit(sc, mip++, TULIP_MEDIA_100BASETX_FD,
+			  TULIP_GP_ZX34X_INIT,
+			  TULIP_CMD_PORTSELECT|TULIP_CMD_PCSFUNCTION
+			      |TULIP_CMD_SCRAMBLER|TULIP_CMD_FULLDUPLEX);
 }
 
+static const tulip_boardsw_t tulip_21140_znyx_zx34x_boardsw = {
+    TULIP_21140_ZNYX_ZX34X,
+    tulip_21140_znyx_zx34x_media_probe,
+    tulip_media_select,
+    tulip_null_media_poll,
+    tulip_2114x_media_preset,
+};
+
 static void
-tulip_21140_znyx_zx34x_media_select(
+tulip_2114x_media_probe(
     tulip_softc_t * const sc)
 {
     sc->tulip_cmdmode |= TULIP_CMD_STOREFWD|TULIP_CMD_MUSTBEONE
 	|TULIP_CMD_BACKOFFCTR;
-    sc->tulip_flags |= TULIP_LINKUP;
-    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_ZX34X_PINS);
-    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_ZX34X_INIT);
-    if (sc->tulip_if.if_flags & IFF_ALTPHYS) {
-	if ((sc->tulip_flags & TULIP_ALTPHYS) == 0)
-	    sc->tulip_flags |= TULIP_PRINTMEDIA|TULIP_ALTPHYS;
-	sc->tulip_cmdmode &= ~TULIP_CMD_TXTHRSHLDCTL;
-	sc->tulip_media = TULIP_MEDIA_100BASETX;
-    } else {
-	if (sc->tulip_flags & TULIP_ALTPHYS)
-	    sc->tulip_flags ^= TULIP_PRINTMEDIA|TULIP_ALTPHYS;
-	sc->tulip_cmdmode |= TULIP_CMD_TXTHRSHLDCTL;
-	sc->tulip_media = TULIP_MEDIA_10BASET;
-    }
-#ifdef BIG_PACKET
-    if (sc->tulip_if.if_mtu > ETHERMTU) {
-	TULIP_CSR_WRITE(sc, csr_watchdog, TULIP_WATCHDOG_RXDISABLE|TULIP_WATCHDOG_TXDISABLE);
-    }
-#endif
 }
 
-static const tulip_boardsw_t tulip_21140_znyx_zx34x_boardsw = {
-    TULIP_21140_ZNYX_ZX34X,
-    "ZNYX ZX34X ",
-    tulip_21140_znyx_zx34x_media_probe,
-    tulip_21140_znyx_zx34x_media_select,
-    tulip_21140_nomii_media_preset,
+static const tulip_boardsw_t tulip_2114x_isv_boardsw = {
+    TULIP_21140_ISV,
+    tulip_2114x_media_probe,
+    tulip_media_select,
+    tulip_media_poll,
+    tulip_2114x_media_preset,
 };
 
-static const struct {
-    unsigned short value_gp;
-    unsigned short value_phyctl;
-} tulip_21140_de500_csrvalues[] = {
-    { TULIP_GP_DE500_HALFDUPLEX, 0 },	/* TULIP_MEDIA_UNKNOWN */
-    { TULIP_GP_DE500_HALFDUPLEX, 0 },	/* TULIP_MEDIA_10BASET */
-    { /* n/a */ },			/* TULIP_MEDIA_BNC */
-    { /* n/a */ },			/* TULIP_MEDIA_AUI */
-    { /* n/a */ },			/* TULIP_MEDIA_BNCAUI */
-    { 0, PHYCTL_FULL_DUPLEX },		/* TULIP_MEDIA_10BASET_FD */
-    { TULIP_GP_DE500_HALFDUPLEX|	/* TULIP_MEDIA_100BASET */
-      TULIP_GP_DE500_FORCE_100, PHYCTL_SELECT_100MB },
-    { TULIP_GP_DE500_FORCE_100,		/* TULIP_MEDIA_100BASET_FD */
-      PHYCTL_SELECT_100MB|PHYCTL_FULL_DUPLEX },
-    { TULIP_GP_DE500_HALFDUPLEX|	/* TULIP_MEDIA_100BASET4 */
-      TULIP_GP_DE500_FORCE_100, PHYCTL_SELECT_100MB },
-};
+/*
+ * ******** END of chip-specific handlers. ***********
+ */
 
+/*
+ * Code the read the SROM and MII bit streams (I2C)
+ */
 static void
-tulip_21140_de500_media_select(
+tulip_delay_300ns(
     tulip_softc_t * const sc)
 {
-    if (sc->tulip_if.if_flags & IFF_ALTPHYS) {
-	if (sc->tulip_if.if_flags & IFF_FULLDUPLEX) {
-	    sc->tulip_media = TULIP_MEDIA_100BASETX_FD;
-	    sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX;
-	} else {
-	    sc->tulip_media = TULIP_MEDIA_100BASETX;
-	    sc->tulip_cmdmode &= ~TULIP_CMD_FULLDUPLEX;
-	}
-	if ((sc->tulip_flags & TULIP_ALTPHYS) == 0)
-	    sc->tulip_flags |= TULIP_PRINTMEDIA|TULIP_ALTPHYS;
-    } else {
-	if (sc->tulip_if.if_flags & IFF_FULLDUPLEX) {
-	    sc->tulip_media = TULIP_MEDIA_10BASET_FD;
-	    sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX;
-	} else {
-	    sc->tulip_media = TULIP_MEDIA_10BASET;
-	    sc->tulip_cmdmode &= ~TULIP_CMD_FULLDUPLEX;
-	}
-	if (sc->tulip_flags & TULIP_ALTPHYS)
-	    sc->tulip_flags ^= TULIP_PRINTMEDIA|TULIP_ALTPHYS;
+    int idx;
+    for (idx = (300 / 33) + 1; idx > 0; idx--)
+	(void) TULIP_CSR_READ(sc, csr_busmode);
+}
+
+#define EMIT    do { TULIP_CSR_WRITE(sc, csr_srom_mii, csr); tulip_delay_300ns(sc); } while (0)
+
+static void
+tulip_srom_idle(
+    tulip_softc_t * const sc)
+{
+    unsigned bit, csr;
+    
+    csr  = SROMSEL ; EMIT;
+    csr  = SROMSEL | SROMRD; EMIT;  
+    csr ^= SROMCS; EMIT;
+    csr ^= SROMCLKON; EMIT;
+
+    /*
+     * Write 25 cycles of 0 which will force the SROM to be idle.
+     */
+    for (bit = 3 + SROM_BITWIDTH + 16; bit > 0; bit--) {
+        csr ^= SROMCLKOFF; EMIT;    /* clock low; data not valid */
+        csr ^= SROMCLKON; EMIT;     /* clock high; data valid */
     }
+    csr ^= SROMCLKOFF; EMIT;
+    csr ^= SROMCS; EMIT;
+    csr  = 0; EMIT;
 }
 
-static int
-tulip_21140_de500xa_media_probe(
+     
+static void
+tulip_srom_read(
     tulip_softc_t * const sc)
+{   
+    int idx; 
+    const unsigned bitwidth = SROM_BITWIDTH;
+    const unsigned cmdmask = (SROMCMD_RD << bitwidth);
+    const unsigned msb = 1 << (bitwidth + 3 - 1);
+    unsigned lastidx = (1 << bitwidth) - 1;
+
+    tulip_srom_idle(sc);
+
+    for (idx = 0; idx <= lastidx; idx++) {
+        unsigned lastbit, data, bits, bit, csr;
+	csr  = SROMSEL ;	        EMIT;
+        csr  = SROMSEL | SROMRD;        EMIT;
+        csr ^= SROMCSON;                EMIT;
+        csr ^=            SROMCLKON;    EMIT;
+    
+        lastbit = 0;
+        for (bits = idx|cmdmask, bit = bitwidth + 3; bit > 0; bit--, bits <<= 1) {
+            const unsigned thisbit = bits & msb;
+            csr ^= SROMCLKOFF; EMIT;    /* clock low; data not valid */
+            if (thisbit != lastbit) {
+                csr ^= SROMDOUT; EMIT;  /* clock low; invert data */
+            } else {
+		EMIT;
+	    }
+            csr ^= SROMCLKON; EMIT;     /* clock high; data valid */
+            lastbit = thisbit;
+        }
+        csr ^= SROMCLKOFF; EMIT;
+
+        for (data = 0, bits = 0; bits < 16; bits++) {
+            data <<= 1;
+            csr ^= SROMCLKON; EMIT;     /* clock high; data valid */ 
+            data |= TULIP_CSR_READ(sc, csr_srom_mii) & SROMDIN ? 1 : 0;
+            csr ^= SROMCLKOFF; EMIT;    /* clock low; data not valid */
+        }
+	sc->tulip_rombuf[idx*2] = data & 0xFF;
+	sc->tulip_rombuf[idx*2+1] = data >> 8;
+	csr  = SROMSEL | SROMRD; EMIT;
+	csr  = 0; EMIT;
+    }
+    tulip_srom_idle(sc);
+}
+
+#define MII_EMIT    do { TULIP_CSR_WRITE(sc, csr_srom_mii, csr); tulip_delay_300ns(sc); } while (0)
+
+static void
+tulip_mii_writebits(
+    tulip_softc_t * const sc,
+    unsigned data,
+    unsigned bits)
 {
-    int idx;
+    unsigned msb = 1 << (bits - 1);
+    unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK);
+    unsigned lastbit = (csr & MII_DOUT) ? msb : 0;
 
-    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_DE500_PINS);
-    DELAY(500);
-    TULIP_CSR_WRITE(sc, csr_gp,
-		    TULIP_GP_DE500_HALFDUPLEX|TULIP_GP_DE500_FORCE_100);
-    DELAY(1000);
-    TULIP_CSR_WRITE(sc, csr_command,
-		    TULIP_CSR_READ(sc, csr_command)
-		    |TULIP_CMD_PORTSELECT|TULIP_CMD_PCSFUNCTION
-		    |TULIP_CMD_SCRAMBLER|TULIP_CMD_MUSTBEONE);
-    TULIP_CSR_WRITE(sc, csr_command,
-		    TULIP_CSR_READ(sc, csr_command) & ~TULIP_CMD_TXTHRSHLDCTL);
-    for (idx = 2400; idx > 0; idx--) {
-	u_int32_t data;
-	DELAY(1000);
-	data = ~TULIP_CSR_READ(sc, csr_gp);
-	if ((data & (TULIP_GP_DE500_LINK_PASS|TULIP_GP_DE500_SYM_LINK)) == (TULIP_GP_DE500_SYM_LINK|TULIP_GP_DE500_LINK_PASS))
-	    return 1;
+    csr |= MII_WR; MII_EMIT;  		/* clock low; assert write */
+
+    for (; bits > 0; bits--, data <<= 1) {
+	const unsigned thisbit = data & msb;
+	if (thisbit != lastbit) {
+	    csr ^= MII_DOUT; MII_EMIT;  /* clock low; invert data */
+	}
+	csr ^= MII_CLKON; MII_EMIT;     /* clock high; data valid */
+	lastbit = thisbit;
+	csr ^= MII_CLKOFF; MII_EMIT;    /* clock low; data not valid */
     }
-    return 0;
 }
 
 static void
-tulip_21140_de500xa_media_select(
+tulip_mii_turnaround(
+    tulip_softc_t * const sc,
+    unsigned cmd)
+{
+    unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK);
+
+    if (cmd == MII_WRCMD) {
+	csr |= MII_DOUT; MII_EMIT;	/* clock low; change data */
+	csr ^= MII_CLKON; MII_EMIT;	/* clock high; data valid */
+	csr ^= MII_CLKOFF; MII_EMIT;	/* clock low; data not valid */
+	csr ^= MII_DOUT; MII_EMIT;	/* clock low; change data */
+    } else {
+	csr |= MII_RD; MII_EMIT;	/* clock low; switch to read */
+    }
+    csr ^= MII_CLKON; MII_EMIT;		/* clock high; data valid */
+    csr ^= MII_CLKOFF; MII_EMIT;	/* clock low; data not valid */
+}
+
+static unsigned
+tulip_mii_readbits(
     tulip_softc_t * const sc)
 {
-    sc->tulip_cmdmode |= TULIP_CMD_STOREFWD|TULIP_CMD_MUSTBEONE
-	|TULIP_CMD_BACKOFFCTR;
-    sc->tulip_flags |= TULIP_LINKUP;
-    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_DE500_PINS);
-    tulip_21140_de500_media_select(sc);
-    TULIP_CSR_WRITE(sc, csr_gp, tulip_21140_de500_csrvalues[sc->tulip_media].value_gp);
-#ifdef BIG_PACKET
-    if (sc->tulip_if.if_mtu > ETHERMTU) {
-	TULIP_CSR_WRITE(sc, csr_watchdog, TULIP_WATCHDOG_RXDISABLE|TULIP_WATCHDOG_TXDISABLE);
+    unsigned data;
+    unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK);
+    int idx;
+
+    for (idx = 0, data = 0; idx < 16; idx++) {
+	data <<= 1;	/* this is NOOP on the first pass through */
+	csr ^= MII_CLKON; MII_EMIT;	/* clock high; data valid */
+	if (TULIP_CSR_READ(sc, csr_srom_mii) & MII_DIN)
+	    data |= 1;
+	csr ^= MII_CLKOFF; MII_EMIT;	/* clock low; data not valid */
     }
+    csr ^= MII_RD; MII_EMIT;		/* clock low; turn off read */
+
+    return data;
+}
+
+static unsigned
+tulip_mii_readreg(
+    tulip_softc_t * const sc,
+    unsigned devaddr,
+    unsigned regno)
+{
+    unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK);
+    unsigned data;
+
+    csr &= ~(MII_RD|MII_CLK); MII_EMIT;
+    tulip_mii_writebits(sc, MII_PREAMBLE, 32);
+    tulip_mii_writebits(sc, MII_RDCMD, 8);
+    tulip_mii_writebits(sc, devaddr, 5);
+    tulip_mii_writebits(sc, regno, 5);
+    tulip_mii_turnaround(sc, MII_RDCMD);
+
+    data = tulip_mii_readbits(sc);
+#if defined(TULIP_DEBUG)
+    sc->tulip_dbg.dbg_phyregs[regno][0] = data;
+    sc->tulip_dbg.dbg_phyregs[regno][1]++;
 #endif
+    return data;
 }
 
-static const tulip_boardsw_t tulip_21140_de500xa_boardsw = {
-    TULIP_21140_DEC_DE500, "Digital DE500-XA ",
-    tulip_21140_de500xa_media_probe,
-    tulip_21140_de500xa_media_select,
-    tulip_21140_nomii_media_preset,
-};
+static void
+tulip_mii_writereg(
+    tulip_softc_t * const sc,
+    unsigned devaddr,
+    unsigned regno,
+    unsigned data)
+{
+    unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK);
+    csr &= ~(MII_RD|MII_CLK); MII_EMIT;
+    tulip_mii_writebits(sc, MII_PREAMBLE, 32);
+    tulip_mii_writebits(sc, MII_WRCMD, 8);
+    tulip_mii_writebits(sc, devaddr, 5);
+    tulip_mii_writebits(sc, regno, 5);
+    tulip_mii_turnaround(sc, MII_WRCMD);
+    tulip_mii_writebits(sc, data, 16);
+#if defined(TULIP_DEBUG)
+    sc->tulip_dbg.dbg_phyregs[regno][2] = data;
+    sc->tulip_dbg.dbg_phyregs[regno][3]++;
+#endif
+}
 
-static int
-tulip_21140_de500aa_media_probe(
-    tulip_softc_t * const sc)
+#define	tulip_mchash(mca)	(tulip_crc32(mca, 6) & 0x1FF)
+#define	tulip_srom_crcok(databuf)	( \
+    ((tulip_crc32(databuf, 126) & 0xFFFF) ^ 0xFFFF)== \
+     ((databuf)[126] | ((databuf)[127] << 8)))
+
+static unsigned
+tulip_crc32(
+    const unsigned char *databuf,
+    size_t datalen)
 {
-    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_DE500_PINS);
-    TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_DE500_PHY_RESET);
-    DELAY(1000);
-    TULIP_CSR_WRITE(sc, csr_gp, 0);
+    u_int idx, bit, data, crc = 0xFFFFFFFFUL;
 
-    TULIP_CSR_WRITE(sc, csr_command, TULIP_CMD_PORTSELECT);
-    return 0;
+    for (idx = 0; idx < datalen; idx++)
+        for (data = *databuf++, bit = 0; bit < 8; bit++, data >>= 1)
+            crc = (crc >> 1) ^ (((crc ^ data) & 1) ? TULIP_CRC32_POLY : 0);
+    return crc;
 }
-
+
 static void
-tulip_21140_de500aa_media_select(
+tulip_identify_dec_nic(
     tulip_softc_t * const sc)
 {
-    const tulip_phy_t *phy = sc->tulip_phys;
-    u_int32_t data;
-
-    if (phy == NULL)
+    strcpy(sc->tulip_boardid, "DEC ");
+#define D0	4
+    if (sc->tulip_chipid <= TULIP_DE425)
 	return;
-
-    /*
-     * Defer autosensing until out of device probe (will be
-     * triggered by ifwatchdog or ifioctl).
-     */
-
-    if (sc->tulip_media == TULIP_MEDIA_UNKNOWN) {
-	tulip_media_t old_media;
-	if (sc->tulip_probe_state != TULIP_PROBE_MEDIATEST)
-	    tulip_21140_autonegotiate(sc, phy);
-	if (sc->tulip_probe_state != TULIP_PROBE_MEDIATEST)
+    if (bcmp(sc->tulip_rombuf + 29, "DE500", 5) == 0
+	|| bcmp(sc->tulip_rombuf + 29, "DE450", 5) == 0) {
+	bcopy(sc->tulip_rombuf + 29, &sc->tulip_boardid[D0], 8);
+	sc->tulip_boardid[D0+8] = ' ';
+    }
+#undef D0
+}
+
+static void
+tulip_identify_znyx_nic(
+    tulip_softc_t * const sc)
+{
+    unsigned id = 0;
+    strcpy(sc->tulip_boardid, "ZNYX ZX3XX ");
+    if (sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) {
+	unsigned znyx_ptr;
+	sc->tulip_boardid[8] = '4';
+	znyx_ptr = sc->tulip_rombuf[124] + 256 * sc->tulip_rombuf[125];
+	if (znyx_ptr < 26 || znyx_ptr > 116) {
+	    sc->tulip_boardsw = &tulip_21140_znyx_zx34x_boardsw;
 	    return;
-	old_media = sc->tulip_media;
-	if (sc->tulip_if.if_flags & IFF_NOAUTONEG) {
-	    tulip_21140_de500_media_select(sc);
-	} else {
-	    sc->tulip_media = tulip_21140_phy_readspecific(sc, phy);
-	    if (sc->tulip_media == TULIP_MEDIA_UNKNOWN) {
-		sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
-		tulip_21140_autonegotiate(sc, phy);
-		return;
+	}
+	/* ZX344 = 0010 .. 0013FF
+	 */
+	if (sc->tulip_rombuf[znyx_ptr] == 0x4A
+		&& sc->tulip_rombuf[znyx_ptr + 1] == 0x52
+		&& sc->tulip_rombuf[znyx_ptr + 2] == 0x01) {
+	    id = sc->tulip_rombuf[znyx_ptr + 5] + 256 * sc->tulip_rombuf[znyx_ptr + 4];
+	    if ((id >> 8) == (TULIP_ZNYX_ID_ZX342 >> 8)) {
+		sc->tulip_boardid[9] = '2';
+		if (id == TULIP_ZNYX_ID_ZX342B) {
+		    sc->tulip_boardid[10] = 'B';
+		    sc->tulip_boardid[11] = ' ';
+		}
+		sc->tulip_boardsw = &tulip_21140_znyx_zx34x_boardsw;
+	    } else if (id == TULIP_ZNYX_ID_ZX344) {
+		sc->tulip_boardid[10] = '4';
+		sc->tulip_boardsw = &tulip_21140_znyx_zx34x_boardsw;
+	    } else if (id == TULIP_ZNYX_ID_ZX345) {
+		sc->tulip_boardid[9] = (sc->tulip_rombuf[19] > 1) ? '8' : '5';
+	    } else if (id == TULIP_ZNYX_ID_ZX346) {
+		sc->tulip_boardid[9] = '6';
+	    } else if (id == TULIP_ZNYX_ID_ZX351) {
+		sc->tulip_boardid[8] = '5';
+		sc->tulip_boardid[9] = '1';
 	    }
-	    sc->tulip_flags |= TULIP_PRINTMEDIA;
 	}
-	sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
-	sc->tulip_flags &= ~TULIP_TXPROBE_ACTIVE;
-	sc->tulip_intrmask &= ~TULIP_STS_GPTIMEOUT;
-	if (sc->tulip_flags & TULIP_INRESET)
-	    goto in_reset;
-	if (sc->tulip_media != old_media)
-	    sc->tulip_flags |= TULIP_NEEDRESET;
+	if (id == 0) {
+	    /*
+	     * Assume it's a ZX342...
+	     */
+	    sc->tulip_boardsw = &tulip_21140_znyx_zx34x_boardsw;
+	}
 	return;
     }
-    if ((sc->tulip_flags & TULIP_INRESET) == 0) {
-	tulip_21140_mii_link_monitor(sc, phy);
+    sc->tulip_boardid[8] = '1';
+    if (sc->tulip_chipid == TULIP_21041) {
+	sc->tulip_boardid[10] = '1';
 	return;
     }
-  in_reset:
-    if (sc->tulip_if.if_flags & IFF_ALTPHYS) {
-	sc->tulip_flags |= TULIP_ALTPHYS;
-    } else {
-	sc->tulip_flags &= ~TULIP_ALTPHYS;
-    }
-    sc->tulip_gpticks = 8;
-    sc->tulip_intrmask |= TULIP_STS_ABNRMLINTR|TULIP_STS_GPTIMEOUT|TULIP_STS_NORMALINTR;
-    tulip_21140_gp_timer_set(sc, 425);
-    data = tulip_mii_readreg(sc, phy->phy_devaddr, PHYREG_CONTROL);
-    if ((data & PHYCTL_AUTONEG_ENABLE) == 0) {
-	data &= ~(PHYCTL_SELECT_100MB|PHYCTL_FULL_DUPLEX);
-	data |= tulip_21140_de500_csrvalues[sc->tulip_media].value_phyctl;
-	tulip_mii_writereg(sc, phy->phy_devaddr, PHYREG_CONTROL, data);
+    if (sc->tulip_rombuf[32] == 0x4A && sc->tulip_rombuf[33] == 0x52) {
+	id = sc->tulip_rombuf[37] + 256 * sc->tulip_rombuf[36];
+	if (id == TULIP_ZNYX_ID_ZX312T) {
+	    sc->tulip_boardid[9] = '2';
+	    sc->tulip_boardid[10] = 'T';
+	    sc->tulip_boardid[11] = ' ';
+	    sc->tulip_boardsw = &tulip_21040_10baset_only_boardsw;
+	} else if (id == TULIP_ZNYX_ID_ZX314_INTA) {
+	    sc->tulip_boardid[9] = '4';
+	    sc->tulip_boardsw = &tulip_21040_10baset_only_boardsw;
+	    sc->tulip_features |= TULIP_HAVE_SHAREDINTR|TULIP_HAVE_BASEROM;
+	} else if (id == TULIP_ZNYX_ID_ZX314) {
+	    sc->tulip_boardid[9] = '4';
+	    sc->tulip_boardsw = &tulip_21040_10baset_only_boardsw;
+	    sc->tulip_features |= TULIP_HAVE_BASEROM;
+	} else if (id == TULIP_ZNYX_ID_ZX315_INTA) {
+	    sc->tulip_boardid[9] = '5';
+	    sc->tulip_features |= TULIP_HAVE_SHAREDINTR|TULIP_HAVE_BASEROM;
+	} else if (id == TULIP_ZNYX_ID_ZX315) {
+	    sc->tulip_boardid[9] = '5';
+	    sc->tulip_features |= TULIP_HAVE_BASEROM;
+	} else {
+	    id = 0;
+	}
+    }		    
+    if (id == 0) {
+	if ((sc->tulip_enaddr[3] & ~3) == 0xF0 && (sc->tulip_enaddr[5] & 3) == 0) {
+	    sc->tulip_boardid[9] = '4';
+	    sc->tulip_boardsw = &tulip_21040_10baset_only_boardsw;
+	    sc->tulip_features |= TULIP_HAVE_SHAREDINTR|TULIP_HAVE_BASEROM;
+	} else if ((sc->tulip_enaddr[3] & ~3) == 0xF4 && (sc->tulip_enaddr[5] & 1) == 0) {
+	    sc->tulip_boardid[9] = '5';
+	    sc->tulip_boardsw = &tulip_21040_boardsw;
+	    sc->tulip_features |= TULIP_HAVE_SHAREDINTR|TULIP_HAVE_BASEROM;
+	} else if ((sc->tulip_enaddr[3] & ~3) == 0xEC) {
+	    sc->tulip_boardid[9] = '2';
+	    sc->tulip_boardsw = &tulip_21040_boardsw;
+	}
     }
 }
-
-static const tulip_boardsw_t tulip_21140_de500aa_boardsw = {
-    TULIP_21140_DEC_DE500, "Digital DE500-AA ",
-    tulip_21140_de500aa_media_probe,
-    tulip_21140_de500aa_media_select,
-    tulip_21140_mii_media_preset,
-    tulip_21140_mii_probe,
-};
 
-static int
-tulip_21041_media_probe(
+static void
+tulip_identify_smc_nic(
     tulip_softc_t * const sc)
 {
-    sc->tulip_if.if_baudrate = 10000000;
-    return 0;
-}
+    u_int32_t id1, id2, ei;
+    int auibnc = 0, utp = 0;
+    char *cp;
 
-#ifdef BIG_PACKET
-#define TULIP_21041_SIAGEN_WATCHDOG	(sc->tulip_if.if_mtu > ETHERMTU ? TULIP_WATCHDOG_RXDISABLE|TULIP_WATCHDOG_TXDISABLE : 0)
-#else
-#define	TULIP_21041_SIAGEN_WATCHDOG	0
-#endif
+    strcpy(sc->tulip_boardid, "SMC ");
+    if (sc->tulip_chipid == TULIP_21041)
+	return;
+    if (sc->tulip_chipid != TULIP_21040) {
+	if (sc->tulip_boardsw != &tulip_2114x_isv_boardsw) {
+	    strcpy(&sc->tulip_boardid[4], "9332DST ");
+	    sc->tulip_boardsw = &tulip_21140_smc9332_boardsw;
+	} else if (sc->tulip_features & (TULIP_HAVE_BASEROM|TULIP_HAVE_SLAVEDROM)) {
+	    strcpy(&sc->tulip_boardid[4], "9332BDT ");
+	} else {
+	    strcpy(&sc->tulip_boardid[4], "9334BDT ");
+	}
+	return;
+    }
+    id1 = sc->tulip_rombuf[0x60] | (sc->tulip_rombuf[0x61] << 8);
+    id2 = sc->tulip_rombuf[0x62] | (sc->tulip_rombuf[0x63] << 8);
+    ei  = sc->tulip_rombuf[0x66] | (sc->tulip_rombuf[0x67] << 8);
 
+    strcpy(&sc->tulip_boardid[4], "8432");
+    cp = &sc->tulip_boardid[8];
+    if ((id1 & 1) == 0)
+	*cp++ = 'B', auibnc = 1;
+    if ((id1 & 0xFF) > 0x32)
+	*cp++ = 'T', utp = 1;
+    if ((id1 & 0x4000) == 0)
+	*cp++ = 'A', auibnc = 1;
+    if (id2 == 0x15) {
+	sc->tulip_boardid[7] = '4';
+	*cp++ = '-';
+	*cp++ = 'C';
+	*cp++ = 'H';
+	*cp++ = (ei ? '2' : '1');
+    }
+    *cp++ = ' ';
+    *cp = '\0';
+    if (utp && !auibnc)
+	sc->tulip_boardsw = &tulip_21040_10baset_only_boardsw;
+    else if (!utp && auibnc)
+	sc->tulip_boardsw = &tulip_21040_auibnc_only_boardsw;
+}
+
 static void
-tulip_21041_media_select(
+tulip_identify_cogent_nic(
     tulip_softc_t * const sc)
 {
-    sc->tulip_cmdmode |= TULIP_CMD_CAPTREFFCT|TULIP_CMD_ENHCAPTEFFCT
-	|TULIP_CMD_THRSHLD160|TULIP_CMD_BACKOFFCTR;
-    sc->tulip_intrmask |= TULIP_STS_NORMALINTR|TULIP_STS_GPTIMEOUT|TULIP_STS_TXINTR
-	|TULIP_STS_ABNRMLINTR|TULIP_STS_LINKPASS|TULIP_STS_LINKFAIL;
-    if (sc->tulip_if.if_flags & IFF_ALTPHYS) {
-	if ((sc->tulip_flags & TULIP_ALTPHYS) == 0) {
-	    sc->tulip_media = TULIP_MEDIA_UNKNOWN;
-	    sc->tulip_flags &= ~(TULIP_TXPROBE_OK|TULIP_TXPROBE_ACTIVE);
-	    sc->tulip_flags |= TULIP_ALTPHYS|TULIP_WANTRXACT;
-	    sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
-	}
-    } else {
-	if (sc->tulip_flags & TULIP_ALTPHYS) {
-	    sc->tulip_media = TULIP_MEDIA_UNKNOWN;
-	    sc->tulip_flags &= ~(TULIP_TXPROBE_OK|TULIP_TXPROBE_ACTIVE|TULIP_ALTPHYS);
-	    sc->tulip_flags |= TULIP_WANTRXACT;
-	    sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
+    strcpy(sc->tulip_boardid, "Cogent ");
+    if (sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) {
+	if (sc->tulip_rombuf[32] == TULIP_COGENT_EM100_ID)
+	    sc->tulip_boardsw = &tulip_21140_cogent_em100_boardsw;
+	/*
+	 * Magic number (0x24001109U) is the SubVendor (0x2400) and
+	 * SubDevId (0x1109) for the ANA6944TX (EM440TX).
+	 */
+	if (*(u_int32_t *) sc->tulip_rombuf == 0x24001109U
+		&& (sc->tulip_features & TULIP_HAVE_BASEROM)) {
+	    /*
+	     * Cogent (Adaptec) is still mapping all INTs to INTA of
+	     * first 21140.  Dumb!  Dumb!
+	     */
+	    sc->tulip_features |= TULIP_HAVE_SHAREDINTR;
 	}
+    } else if (sc->tulip_chipid == TULIP_21040) {
+	sc->tulip_features |= TULIP_HAVE_SHAREDINTR|TULIP_HAVE_BASEROM;
     }
+}
+
+static void
+tulip_identify_asante_nic(
+    tulip_softc_t * const sc)
+{
+    strcpy(sc->tulip_boardid, "Asante ");
+    if ((sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A)
+	    && sc->tulip_boardsw != &tulip_2114x_isv_boardsw) {
+	tulip_media_info_t *mi = sc->tulip_mediainfo;
+	int idx;
+	/*
+	 * The Asante Fast Ethernet doesn't always ship with a valid
+	 * new format SROM.  So if isn't in the new format, we cheat
+	 * set it up as if we had.
+	 */
 
-    if (TULIP_CSR_READ(sc, csr_sia_status) & TULIP_SIASTS_LINKFAIL) {
-	if (sc->tulip_media == TULIP_MEDIA_BNC) {
-	    sc->tulip_intrmask &= ~TULIP_STS_GPTIMEOUT;
-	    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
-	    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_21041_SIACONN_BNC);
-	    TULIP_CSR_WRITE(sc, csr_sia_tx_rx,        TULIP_21041_SIATXRX_BNC);
-	    TULIP_CSR_WRITE(sc, csr_sia_general,      TULIP_21041_SIAGEN_BNC|TULIP_21041_SIAGEN_WATCHDOG);
-	    return;
-	} else if (sc->tulip_media == TULIP_MEDIA_AUI) {
-	    sc->tulip_intrmask &= ~TULIP_STS_GPTIMEOUT;
-	    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
-	    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_21041_SIACONN_AUI);
-	    TULIP_CSR_WRITE(sc, csr_sia_tx_rx,        TULIP_21041_SIATXRX_AUI);
-	    TULIP_CSR_WRITE(sc, csr_sia_general,      TULIP_21041_SIAGEN_AUI|TULIP_21041_SIAGEN_WATCHDOG);
+	sc->tulip_gpinit = TULIP_GP_ASANTE_PINS;
+	sc->tulip_gpdata = 0;
+
+	TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_ASANTE_PINS|TULIP_GP_PINSET);
+	TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_ASANTE_PHYRESET);
+	DELAY(100);
+	TULIP_CSR_WRITE(sc, csr_gp, 0);
+
+	mi->mi_type = TULIP_MEDIAINFO_MII;
+	mi->mi_gpr_length = 0;
+	mi->mi_gpr_offset = 0;
+	mi->mi_reset_length = 0;
+	mi->mi_reset_offset = 0;;
+
+	mi->mi_phyaddr = TULIP_MII_NOPHY;
+	for (idx = 20; idx > 0 && mi->mi_phyaddr == TULIP_MII_NOPHY; idx--) {
+	    DELAY(10000);
+	    mi->mi_phyaddr = tulip_mii_get_phyaddr(sc, 0);
+	}
+	if (mi->mi_phyaddr == TULIP_MII_NOPHY) {
+	    printf(TULIP_PRINTF_FMT ": can't find phy 0\n", TULIP_PRINTF_ARGS);
 	    return;
 	}
-	/*
-	 * If we've been reset, the SIA is reset.  Restart the probe.
-	 */
-	if (sc->tulip_probe_state == TULIP_PROBE_10BASET
-		&& (sc->tulip_flags & TULIP_INRESET))
-	    sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
 
-	/*
-	 * Reset OACTIVE in case were being called from tulip_reset.
-	 */
-	sc->tulip_if.if_flags |= IFF_OACTIVE;
-	switch (sc->tulip_probe_state) {
-	    case TULIP_PROBE_INACTIVE: {
-		sc->tulip_gpticks = 200;
-		sc->tulip_probe_state = TULIP_PROBE_10BASET;
-		TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
-		TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
-		TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_21041_SIACONN_10BASET);
-		if (sc->tulip_cmdmode & TULIP_CMD_FULLDUPLEX)
-		    TULIP_CSR_WRITE(sc, csr_sia_tx_rx,        TULIP_21041_SIATXRX_10BASET_FD);
-		else 
-		    TULIP_CSR_WRITE(sc, csr_sia_tx_rx,        TULIP_21041_SIATXRX_10BASET);
-		TULIP_CSR_WRITE(sc, csr_sia_general,      TULIP_21041_SIAGEN_10BASET|TULIP_21041_SIAGEN_WATCHDOG);
-		TULIP_CSR_WRITE(sc, csr_gp_timer, 12000000 / 204800); /* 120 ms */
-		TULIP_CSR_WRITE(sc, csr_status, TULIP_STS_GPTIMEOUT);
-		break;
+	sc->tulip_features |= TULIP_HAVE_MII;
+	mi->mi_capabilities  = PHYSTS_10BASET|PHYSTS_10BASET_FD|PHYSTS_100BASETX|PHYSTS_100BASETX_FD;
+	mi->mi_advertisement = PHYSTS_10BASET|PHYSTS_10BASET_FD|PHYSTS_100BASETX|PHYSTS_100BASETX_FD;
+	mi->mi_full_duplex   = PHYSTS_10BASET_FD|PHYSTS_100BASETX_FD;
+	mi->mi_tx_threshold  = PHYSTS_10BASET|PHYSTS_10BASET_FD;
+	TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 100BASETX_FD);
+	TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 100BASETX);
+	TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 100BASET4);
+	TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 10BASET_FD);
+	TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 10BASET);
+	mi->mi_phyid = (tulip_mii_readreg(sc, mi->mi_phyaddr, PHYREG_IDLOW) << 16) |
+	    tulip_mii_readreg(sc, mi->mi_phyaddr, PHYREG_IDHIGH);
+
+	sc->tulip_boardsw = &tulip_2114x_isv_boardsw;
+    }
+}
+
+static int
+tulip_srom_decode(
+    tulip_softc_t * const sc)
+{
+    int idx1, idx2, idx3;
+
+    const tulip_srom_header_t *shp = (tulip_srom_header_t *) &sc->tulip_rombuf[0];
+    const tulip_srom_adapter_info_t *saip = (tulip_srom_adapter_info_t *) (shp + 1);
+    tulip_srom_media_t srom_media;
+    tulip_media_info_t *mi = sc->tulip_mediainfo;
+    const u_int8_t *dp;
+    u_int32_t leaf_offset, blocks, data;
+
+    for (idx1 = 0; idx1 < shp->sh_adapter_count; idx1++, saip++) {
+	if (shp->sh_adapter_count == 1)
+	    break;
+	if (saip->sai_device == sc->tulip_pci_devno)
+	    break;
+    }
+    /*
+     * Didn't find the right media block for this card.
+     */
+    if (idx1 == shp->sh_adapter_count)
+	return 0;
+
+    /*
+     * Save the hardware address.
+     */
+    bcopy((caddr_t) shp->sh_ieee802_address, (caddr_t) sc->tulip_enaddr, 6);
+    /*
+     * If this is a multiple port card, add the adapter index to the last
+     * byte of the hardware address.  (if it isn't multiport, adding 0
+     * won't hurt.
+     */
+    sc->tulip_enaddr[5] += idx1;
+
+    leaf_offset = saip->sai_leaf_offset_lowbyte
+	+ saip->sai_leaf_offset_highbyte * 256;
+    dp = sc->tulip_rombuf + leaf_offset;
+	
+    sc->tulip_conntype = (tulip_srom_connection_t) (dp[0] + dp[1] * 256); dp += 2;
+
+    for (idx2 = 0;; idx2++) {
+	if (tulip_srom_conninfo[idx2].sc_type == sc->tulip_conntype
+	        || tulip_srom_conninfo[idx2].sc_type == TULIP_SROM_CONNTYPE_NOT_USED)
+	    break;
+    }
+    sc->tulip_connidx = idx2;
+
+    if (sc->tulip_chipid == TULIP_21041) {
+	blocks = *dp++;
+	for (idx2 = 0; idx2 < blocks; idx2++) {
+	    tulip_media_t media;
+	    data = *dp++;
+	    srom_media = (tulip_srom_media_t) (data & 0x3F);
+	    for (idx3 = 0; tulip_srom_mediums[idx3].sm_type != TULIP_MEDIA_UNKNOWN; idx3++) {
+		if (tulip_srom_mediums[idx3].sm_srom_type == srom_media)
+		    break;
 	    }
-	    case TULIP_PROBE_10BASET: {
-		if (--sc->tulip_gpticks > 0) {
-		    if ((TULIP_CSR_READ(sc, csr_sia_status) & TULIP_SIASTS_OTHERRXACTIVITY) == 0) {
-			TULIP_CSR_WRITE(sc, csr_gp_timer, 12000000 / 204800); /* 120 ms */
-			break;
-		    }
-		}
-		sc->tulip_gpticks = 4;
-		if (TULIP_CSR_READ(sc, csr_sia_status) & TULIP_SIASTS_OTHERRXACTIVITY) {
-		    sc->tulip_probe_state = TULIP_PROBE_BNC;
-		    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
-		    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_21041_SIACONN_BNC);
-		    TULIP_CSR_WRITE(sc, csr_sia_tx_rx,        TULIP_21041_SIATXRX_BNC);
-		    TULIP_CSR_WRITE(sc, csr_sia_general,      TULIP_21041_SIAGEN_BNC|TULIP_21041_SIAGEN_WATCHDOG);
-		    TULIP_CSR_WRITE(sc, csr_sia_status, TULIP_SIASTS_OTHERRXACTIVITY);
-		    TULIP_CSR_WRITE(sc, csr_gp_timer, 100000000 / 204800); /* 100 ms */
+	    media = tulip_srom_mediums[idx3].sm_type;
+	    if (media != TULIP_MEDIA_UNKNOWN) {
+		if (data & TULIP_SROM_21041_EXTENDED) {
+		    mi->mi_type = TULIP_MEDIAINFO_SIA;
+		    sc->tulip_mediums[media] = mi;
+		    mi->mi_sia_connectivity = dp[0] + dp[1] * 256;
+		    mi->mi_sia_tx_rx        = dp[2] + dp[3] * 256;
+		    mi->mi_sia_general      = dp[4] + dp[5] * 256;
+		    mi++;
 		} else {
-		    sc->tulip_probe_state = TULIP_PROBE_AUI;
-		    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
-		    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_21041_SIACONN_AUI);
-		    TULIP_CSR_WRITE(sc, csr_sia_tx_rx,        TULIP_21041_SIATXRX_AUI);
-		    TULIP_CSR_WRITE(sc, csr_sia_general,      TULIP_21041_SIAGEN_AUI|TULIP_21041_SIAGEN_WATCHDOG);
-		    TULIP_CSR_WRITE(sc, csr_gp_timer, 100000000 / 204800); /* 100 ms */
-		}
-		break;
-	    }
-	    case TULIP_PROBE_BNC:
-	    case TULIP_PROBE_AUI: {
-		if (sc->tulip_flags & TULIP_TXPROBE_OK) {
-		    sc->tulip_intrmask &= ~TULIP_STS_GPTIMEOUT;
-		    sc->tulip_flags &= ~(TULIP_TXPROBE_OK|TULIP_TXPROBE_ACTIVE);
-		    sc->tulip_flags |= TULIP_LINKUP;
-		    TULIP_CSR_WRITE(sc, csr_gp_timer, 0); /* disable */
-		    if (sc->tulip_probe_state == TULIP_PROBE_AUI) {
-			if (sc->tulip_media != TULIP_MEDIA_AUI) {
-			    sc->tulip_media = TULIP_MEDIA_AUI;
-			    sc->tulip_flags |= TULIP_PRINTMEDIA;
+		    switch (media) {
+			case TULIP_MEDIA_BNC: {
+			    TULIP_MEDIAINFO_SIA_INIT(sc, mi, 21041, BNC);
+			    mi++;
+			    break;
+			}
+			case TULIP_MEDIA_AUI: {
+			    TULIP_MEDIAINFO_SIA_INIT(sc, mi, 21041, AUI);
+			    mi++;
+			    break;
 			}
-		    } else if (sc->tulip_probe_state == TULIP_PROBE_BNC) {
-			if (sc->tulip_media != TULIP_MEDIA_BNC) {
-			    sc->tulip_media = TULIP_MEDIA_BNC;
-			    sc->tulip_flags |= TULIP_PRINTMEDIA;
+			case TULIP_MEDIA_10BASET: {
+			    TULIP_MEDIAINFO_SIA_INIT(sc, mi, 21041, 10BASET);
+			    mi++;
+			    break;
+			}
+			case TULIP_MEDIA_10BASET_FD: {
+			    TULIP_MEDIAINFO_SIA_INIT(sc, mi, 21041, 10BASET_FD);
+			    mi++;
+			    break;
+			}
+			default: {
+			    break;
 			}
 		    }
-		    TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
-		    sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
+		}
+	    }
+	    if (data & TULIP_SROM_21041_EXTENDED)	
+		dp += 6;
+	}
+#ifdef notdef
+	if (blocks == 0) {
+	    TULIP_MEDIAINFO_SIA_INIT(sc, mi, 21041, BNC); mi++;
+	    TULIP_MEDIAINFO_SIA_INIT(sc, mi, 21041, AUI); mi++;
+	    TULIP_MEDIAINFO_SIA_INIT(sc, mi, 21041, 10BASET); mi++;
+	    TULIP_MEDIAINFO_SIA_INIT(sc, mi, 21041, 10BASET_FD); mi++;
+	}
+#endif
+    } else {
+	unsigned length, type;
+	tulip_media_t gp_media = TULIP_MEDIA_UNKNOWN;
+	if (sc->tulip_features & TULIP_HAVE_GPR)
+	    sc->tulip_gpinit = *dp++;
+	blocks = *dp++;
+	for (idx2 = 0; idx2 < blocks; idx2++) {
+	    const u_int8_t *ep;
+	    if ((*dp & 0x80) == 0) {
+		length = 4;
+		type = 0;
+	    } else {
+		length = (*dp++ & 0x7f) - 1;
+		type = *dp++ & 0x3f;
+	    }
+	    ep = dp + length;
+	    switch (type & 0x3f) {
+		case 0: {	/* 21140[A] GPR block */
+		    tulip_media_t media;
+		    srom_media = (tulip_srom_media_t) dp[0];
+		    for (idx3 = 0; tulip_srom_mediums[idx3].sm_type != TULIP_MEDIA_UNKNOWN; idx3++) {
+			if (tulip_srom_mediums[idx3].sm_srom_type == srom_media)
+			    break;
+		    }
+		    media = tulip_srom_mediums[idx3].sm_type;
+		    if (media == TULIP_MEDIA_UNKNOWN)
+			break;
+		    mi->mi_type = TULIP_MEDIAINFO_GPR;
+		    sc->tulip_mediums[media] = mi;
+		    mi->mi_gpdata = dp[1];
+		    if (media > gp_media && !TULIP_IS_MEDIA_FD(media)) {
+			sc->tulip_gpdata = mi->mi_gpdata;
+			gp_media = media;
+		    }
+		    data = dp[2] + dp[3] * 256;
+		    mi->mi_cmdmode = TULIP_SROM_2114X_CMDBITS(data);
+		    if (data & TULIP_SROM_2114X_NOINDICATOR) {
+			mi->mi_actmask = 0;
+		    } else {
+#if 0
+			mi->mi_default = (data & TULIP_SROM_2114X_DEFAULT) != 0;
+#endif
+			mi->mi_actmask = TULIP_SROM_2114X_BITPOS(data);
+			mi->mi_actdata = (data & TULIP_SROM_2114X_POLARITY) ? 0 : mi->mi_actmask;
+		    }
+		    mi++;
 		    break;
 		}
-		if ((sc->tulip_flags & TULIP_WANTRXACT) == 0
-		    || (TULIP_CSR_READ(sc, csr_sia_status) & TULIP_SIASTS_RXACTIVITY)) {
-		    if ((sc->tulip_flags & TULIP_TXPROBE_ACTIVE) == 0) {
-			struct mbuf *m;
-			/*
-			 * Before we are sure this is the right media we need
-			 * to send a small packet to make sure there's carrier.
-			 * Strangely, BNC and AUI will 'see" receive data if
-			 * either is connected so the transmit is the only way
-			 * to verify the connectivity.
-			 */
-			MGETHDR(m, M_DONTWAIT, MT_DATA);
-			if (m == NULL) {
-			    TULIP_CSR_WRITE(sc, csr_gp_timer, 100000000 / 204800); /* 100 ms */
+		case 1: {	/* 21140[A] MII block */
+		    const unsigned phyno = *dp++;
+		    mi->mi_type = TULIP_MEDIAINFO_MII;
+		    mi->mi_gpr_length = *dp++;
+		    mi->mi_gpr_offset = dp - sc->tulip_rombuf;
+		    dp += mi->mi_gpr_length;
+		    mi->mi_reset_length = *dp++;
+		    mi->mi_reset_offset = dp - sc->tulip_rombuf;
+		    dp += mi->mi_reset_length;
+
+		    /*
+		     * Before we probe for a PHY, use the GPR information
+		     * to select it.  If we don't, it may be inaccessible.
+		     */
+		    TULIP_CSR_WRITE(sc, csr_gp, sc->tulip_gpinit|TULIP_GP_PINSET);
+		    for (idx3 = 0; idx3 < mi->mi_reset_length; idx3++) {
+			DELAY(10);
+			TULIP_CSR_WRITE(sc, csr_gp, sc->tulip_rombuf[mi->mi_reset_offset + idx3]);
+		    }
+		    sc->tulip_phyaddr = mi->mi_phyaddr;
+		    for (idx3 = 0; idx3 < mi->mi_gpr_length; idx3++) {
+			DELAY(10);
+			TULIP_CSR_WRITE(sc, csr_gp, sc->tulip_rombuf[mi->mi_gpr_offset + idx3]);
+		    }
+
+		    /*
+		     * At least write something!
+		     */
+		    if (mi->mi_reset_length == 0 && mi->mi_gpr_length == 0)
+			TULIP_CSR_WRITE(sc, csr_gp, 0);
+
+		    mi->mi_phyaddr = TULIP_MII_NOPHY;
+		    for (idx3 = 20; idx3 > 0 && mi->mi_phyaddr == TULIP_MII_NOPHY; idx3--) {
+			DELAY(10000);
+			mi->mi_phyaddr = tulip_mii_get_phyaddr(sc, phyno);
+		    }
+		    if (mi->mi_phyaddr == TULIP_MII_NOPHY) {
+			printf(TULIP_PRINTF_FMT ": can't find phy %d\n",
+			       TULIP_PRINTF_ARGS, phyno);
+			break;
+		    }
+		    sc->tulip_features |= TULIP_HAVE_MII;
+		    mi->mi_capabilities  = dp[0] + dp[1] * 256; dp += 2;
+		    mi->mi_advertisement = dp[0] + dp[1] * 256; dp += 2;
+		    mi->mi_full_duplex   = dp[0] + dp[1] * 256; dp += 2;
+		    mi->mi_tx_threshold  = dp[0] + dp[1] * 256; dp += 2;
+		    TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 100BASETX_FD);
+		    TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 100BASETX);
+		    TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 100BASET4);
+		    TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 10BASET_FD);
+		    TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 10BASET);
+		    mi->mi_phyid = (tulip_mii_readreg(sc, mi->mi_phyaddr, PHYREG_IDLOW) << 16) |
+			tulip_mii_readreg(sc, mi->mi_phyaddr, PHYREG_IDHIGH);
+		    mi++;
+		    break;
+		}
+		case 2: {	/* 2114[23] SIA block */
+		    tulip_media_t media;
+		    srom_media = (tulip_srom_media_t) dp[0];
+		    for (idx3 = 0; tulip_srom_mediums[idx3].sm_type != TULIP_MEDIA_UNKNOWN; idx3++) {
+			if (tulip_srom_mediums[idx3].sm_srom_type == srom_media)
 			    break;
+		    }
+		    media = tulip_srom_mediums[idx3].sm_type;
+		    if (media == TULIP_MEDIA_UNKNOWN)
+			break;
+		    mi->mi_type = TULIP_MEDIAINFO_SIA;
+		    sc->tulip_mediums[media] = mi;
+		    if (type & 0x40) {
+			mi->mi_sia_connectivity = dp[0] + dp[1] * 256;
+			mi->mi_sia_tx_rx        = dp[2] + dp[3] * 256;
+			mi->mi_sia_general      = dp[4] + dp[5] * 256;
+			dp += 6;
+		    } else {
+			switch (media) {
+			    case TULIP_MEDIA_BNC: {
+				TULIP_MEDIAINFO_SIA_INIT(sc, mi, 21142, BNC);
+				break;
+			    }
+			    case TULIP_MEDIA_AUI: {
+				TULIP_MEDIAINFO_SIA_INIT(sc, mi, 21142, AUI);
+				break;
+			    }
+			    case TULIP_MEDIA_10BASET: {
+				TULIP_MEDIAINFO_SIA_INIT(sc, mi, 21142, 10BASET);
+				break;
+			    }
+			    case TULIP_MEDIA_10BASET_FD: {
+				TULIP_MEDIAINFO_SIA_INIT(sc, mi, 21142, 10BASET_FD);
+				break;
+			    }
+			    default: {
+				goto bad_media;
+			    }
 			}
-			/*
-			 * Construct a LLC TEST message which will point to ourselves.
-			 */
-			bcopy(sc->tulip_hwaddr, mtod(m, struct ether_header *)->ether_dhost, 6);
-			bcopy(sc->tulip_hwaddr, mtod(m, struct ether_header *)->ether_shost, 6);
-			mtod(m, struct ether_header *)->ether_type = htons(3);
-			mtod(m, unsigned char *)[14] = 0;
-			mtod(m, unsigned char *)[15] = 0;
-			mtod(m, unsigned char *)[16] = 0xE3;	/* LLC Class1 TEST (no poll) */
-			m->m_len = m->m_pkthdr.len = sizeof(struct ether_header) + 3;
-			/*
-			 * send it!
-			 */
-			sc->tulip_flags |= TULIP_TXPROBE_ACTIVE;
-			sc->tulip_flags &= ~TULIP_TXPROBE_OK;
-			sc->tulip_cmdmode |= TULIP_CMD_TXRUN;
-			TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
-			IF_PREPEND(&sc->tulip_if.if_snd, m);
-			tulip_ifstart(&sc->tulip_if);
+		    }
+		    mi->mi_sia_gp_control = (dp[0] + dp[1] * 256) << 16;
+		    mi->mi_sia_gp_data    = (dp[2] + dp[3] * 256) << 16;
+		    mi++;
+		  bad_media:
+		    break;
+		}
+		case 3: {	/* 2114[23] MII PHY block */
+		    const unsigned phyno = *dp++;
+		    const u_int8_t *dp0;
+		    mi->mi_type = TULIP_MEDIAINFO_MII;
+		    mi->mi_gpr_length = *dp++;
+		    mi->mi_gpr_offset = dp - sc->tulip_rombuf;
+		    dp += 2 * mi->mi_gpr_length;
+		    mi->mi_reset_length = *dp++;
+		    mi->mi_reset_offset = dp - sc->tulip_rombuf;
+		    dp += 2 * mi->mi_reset_length;
+
+		    dp0 = &sc->tulip_rombuf[mi->mi_reset_offset];
+		    for (idx3 = 0; idx3 < mi->mi_reset_length; idx3++, dp0 += 2) {
+			DELAY(10);
+			TULIP_CSR_WRITE(sc, csr_sia_general, (dp0[0] + 256 * dp0[1]) << 16);
+		    }
+		    sc->tulip_phyaddr = mi->mi_phyaddr;
+		    dp0 = &sc->tulip_rombuf[mi->mi_gpr_offset];
+		    for (idx3 = 0; idx3 < mi->mi_gpr_length; idx3++, dp0 += 2) {
+			DELAY(10);
+			TULIP_CSR_WRITE(sc, csr_sia_general, (dp0[0] + 256 * dp0[1]) << 16);
+		    }
+
+		    if (mi->mi_reset_length == 0 && mi->mi_gpr_length == 0)
+			TULIP_CSR_WRITE(sc, csr_sia_general, 0);
+
+		    mi->mi_phyaddr = TULIP_MII_NOPHY;
+		    for (idx3 = 20; idx3 > 0 && mi->mi_phyaddr == TULIP_MII_NOPHY; idx3--) {
+			DELAY(10000);
+			mi->mi_phyaddr = tulip_mii_get_phyaddr(sc, phyno);
+		    }
+		    if (mi->mi_phyaddr == TULIP_MII_NOPHY) {
+			printf(TULIP_PRINTF_FMT ": can't find phy %d\n",
+			       TULIP_PRINTF_ARGS, phyno);
 			break;
 		    }
-		    sc->tulip_flags &= ~TULIP_TXPROBE_ACTIVE;
+		    sc->tulip_features |= TULIP_HAVE_MII;
+		    mi->mi_capabilities  = dp[0] + dp[1] * 256; dp += 2;
+		    mi->mi_advertisement = dp[0] + dp[1] * 256; dp += 2;
+		    mi->mi_full_duplex   = dp[0] + dp[1] * 256; dp += 2;
+		    mi->mi_tx_threshold  = dp[0] + dp[1] * 256; dp += 2;
+		    mi->mi_mii_interrupt = dp[0] + dp[1] * 256; dp += 2;
+		    TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 100BASETX_FD);
+		    TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 100BASETX);
+		    TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 100BASET4);
+		    TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 10BASET_FD);
+		    TULIP_MEDIAINFO_ADD_CAPABILITY(sc, mi, 10BASET);
+		    mi->mi_phyid = (tulip_mii_readreg(sc, mi->mi_phyaddr, PHYREG_IDLOW) << 16) |
+			tulip_mii_readreg(sc, mi->mi_phyaddr, PHYREG_IDHIGH);
+		    mi++;
+		    break;
 		}
-		/*
-		 * Take 2 passes through before deciding to not
-		 * wait for receive activity.  Then take another
-		 * two passes before spitting out a warning.
-		 */
-		if (sc->tulip_gpticks > 0 && --sc->tulip_gpticks == 0) {
-		    if (sc->tulip_flags & TULIP_WANTRXACT) {
-			sc->tulip_flags &= ~TULIP_WANTRXACT;
-			sc->tulip_gpticks = 4;
+		case 4: {	/* 21143 SYM block */
+		    tulip_media_t media;
+		    srom_media = (tulip_srom_media_t) dp[0];
+		    for (idx3 = 0; tulip_srom_mediums[idx3].sm_type != TULIP_MEDIA_UNKNOWN; idx3++) {
+			if (tulip_srom_mediums[idx3].sm_srom_type == srom_media)
+			    break;
+		    }
+		    media = tulip_srom_mediums[idx3].sm_type;
+		    if (media == TULIP_MEDIA_UNKNOWN)
+			break;
+		    mi->mi_type = TULIP_MEDIAINFO_SYM;
+		    sc->tulip_mediums[media] = mi;
+		    mi->mi_gpcontrol = (dp[1] + dp[2] * 256) << 16;
+		    mi->mi_gpdata    = (dp[3] + dp[4] * 256) << 16;
+		    data = dp[5] + dp[6] * 256;
+		    mi->mi_cmdmode = TULIP_SROM_2114X_CMDBITS(data);
+		    if (data & TULIP_SROM_2114X_NOINDICATOR) {
+			mi->mi_actmask = 0;
 		    } else {
-			printf(TULIP_PRINTF_FMT ": autosense failed: cable problem?\n",
-			       TULIP_PRINTF_ARGS);
+			mi->mi_default = (data & TULIP_SROM_2114X_DEFAULT) != 0;
+			mi->mi_actmask = TULIP_SROM_2114X_BITPOS(data);
+			mi->mi_actdata = (data & TULIP_SROM_2114X_POLARITY) ? 0 : mi->mi_actmask;
 		    }
+		    mi++;
+		    break;
 		}
-		/*
-		 * Since this media failed to probe, try the other one.
-		 */
-		if (sc->tulip_probe_state == TULIP_PROBE_AUI) {
-		    sc->tulip_probe_state = TULIP_PROBE_BNC;
-		    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
-		    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_21041_SIACONN_BNC);
-		    TULIP_CSR_WRITE(sc, csr_sia_tx_rx,        TULIP_21041_SIATXRX_BNC);
-		    TULIP_CSR_WRITE(sc, csr_sia_general,      TULIP_21041_SIAGEN_BNC|TULIP_21041_SIAGEN_WATCHDOG);
-		    TULIP_CSR_WRITE(sc, csr_gp_timer, 100000000 / 204800); /* 100 ms */
-		} else {
-		    sc->tulip_probe_state = TULIP_PROBE_AUI;
-		    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
-		    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_21041_SIACONN_AUI);
-		    TULIP_CSR_WRITE(sc, csr_sia_tx_rx,        TULIP_21041_SIATXRX_AUI);
-		    TULIP_CSR_WRITE(sc, csr_sia_general,      TULIP_21041_SIAGEN_AUI|TULIP_21041_SIAGEN_WATCHDOG);
-		    TULIP_CSR_WRITE(sc, csr_gp_timer, 100000000 / 204800); /* 100 ms */
+#if 0
+		case 5: {	/* 21143 Reset block */
+		    mi->mi_type = TULIP_MEDIAINFO_RESET;
+		    mi->mi_reset_length = *dp++;
+		    mi->mi_reset_offset = dp - sc->tulip_rombuf;
+		    dp += 2 * mi->mi_reset_length;
+		    mi++;
+		    break;
+		}
+#endif
+		default: {
 		}
-		break;
 	    }
+	    dp = ep;
 	}
+    }
+    return mi - sc->tulip_mediainfo;
+}
+
+static const struct {
+    void (*vendor_identify_nic)(tulip_softc_t * const sc);
+    unsigned char vendor_oui[3];
+} tulip_vendors[] = {
+    { tulip_identify_dec_nic,		{ 0x08, 0x00, 0x2B } },
+    { tulip_identify_dec_nic,		{ 0x00, 0x00, 0xF8 } },
+    { tulip_identify_smc_nic,		{ 0x00, 0x00, 0xC0 } },
+    { tulip_identify_smc_nic,		{ 0x00, 0xE0, 0x29 } },
+    { tulip_identify_znyx_nic,		{ 0x00, 0xC0, 0x95 } },
+    { tulip_identify_cogent_nic,	{ 0x00, 0x00, 0x92 } },
+    { tulip_identify_asante_nic,	{ 0x00, 0x00, 0x94 } },
+    { NULL }
+};
+
+/*
+ * This deals with the vagaries of the address roms and the
+ * brain-deadness that various vendors commit in using them.
+ */
+static int
+tulip_read_macaddr(
+    tulip_softc_t * const sc)
+{
+    int cksum, rom_cksum, idx;
+    u_int32_t csr;
+    unsigned char tmpbuf[8];
+    static const u_char testpat[] = { 0xFF, 0, 0x55, 0xAA, 0xFF, 0, 0x55, 0xAA };
+
+    sc->tulip_connidx = TULIP_SROM_LASTCONNIDX;
+
+    if (sc->tulip_chipid == TULIP_21040) {
+	TULIP_CSR_WRITE(sc, csr_enetrom, 1);
+	for (idx = 0; idx < sizeof(sc->tulip_rombuf); idx++) {
+	    int cnt = 0;
+	    while (((csr = TULIP_CSR_READ(sc, csr_enetrom)) & 0x80000000L) && cnt < 10000)
+		cnt++;
+	    sc->tulip_rombuf[idx] = csr & 0xFF;
+	}
+	sc->tulip_boardsw = &tulip_21040_boardsw;
+#if defined(TULIP_EISA)
+    } else if (sc->tulip_chipid == TULIP_DE425) {
+	int cnt;
+	for (idx = 0, cnt = 0; idx < sizeof(testpat) && cnt < 32; cnt++) {
+	    tmpbuf[idx] = TULIP_CSR_READBYTE(sc, csr_enetrom);
+	    if (tmpbuf[idx] == testpat[idx])
+		++idx;
+	    else
+		idx = 0;
+	}
+	for (idx = 0; idx < 32; idx++)
+	    sc->tulip_rombuf[idx] = TULIP_CSR_READBYTE(sc, csr_enetrom);
+	sc->tulip_boardsw = &tulip_21040_boardsw;
+#endif /* TULIP_EISA */
     } else {
+	if (sc->tulip_chipid == TULIP_21041) {
+	    /*
+	     * Thankfully all 21041's act the same.
+	     */
+	    sc->tulip_boardsw = &tulip_21041_boardsw;
+	} else {
+	    /*
+	     * Assume all 21140 board are compatible with the
+	     * DEC 10/100 evaluation board.  Not really valid but
+	     * it's the best we can do until every one switches to
+	     * the new SROM format.
+	     */
+	     
+	    sc->tulip_boardsw = &tulip_21140_eb_boardsw;
+	}
+	tulip_srom_read(sc);
+	if (tulip_srom_crcok(sc->tulip_rombuf)) {
+	    /*
+	     * SROM CRC is valid therefore it must be in the
+	     * new format.
+	     */
+	    sc->tulip_features |= TULIP_HAVE_ISVSROM;
+	} else if (sc->tulip_rombuf[126] == 0xff && sc->tulip_rombuf[127] == 0xFF) {
+	    /*
+	     * No checksum is present.  See if the SROM id checks out;
+	     * the first 18 bytes should be 0 followed by a 1 followed
+	     * by the number of adapters (which we don't deal with yet).
+	     */
+	    for (idx = 0; idx < 18; idx++) {
+		if (sc->tulip_rombuf[idx] != 0)
+		    break;
+	    }
+	    if (idx == 18 && sc->tulip_rombuf[18] == 1 && sc->tulip_rombuf[19] != 0)
+		sc->tulip_features |= TULIP_HAVE_ISVSROM;
+	}
+	if ((sc->tulip_features & TULIP_HAVE_ISVSROM) && tulip_srom_decode(sc)) {
+	    if (sc->tulip_chipid != TULIP_21041)
+		sc->tulip_boardsw = &tulip_2114x_isv_boardsw;
+
+	    /*
+	     * If the SROM specifies more than one adapter, tag this as a
+	     * BASE rom.
+	     */
+	    if (sc->tulip_rombuf[19] > 1)
+		sc->tulip_features |= TULIP_HAVE_BASEROM;
+	    if (sc->tulip_boardsw == NULL)
+		return -6;
+	    goto check_oui;
+	}
+    }
+
+
+    if (bcmp(&sc->tulip_rombuf[0], &sc->tulip_rombuf[16], 8) != 0) {
 	/*
-	 * If the link has passed LinkPass, 10baseT is the
-	 * proper media to use.
+	 * Some folks don't use the standard ethernet rom format
+	 * but instead just put the address in the first 6 bytes
+	 * of the rom and let the rest be all 0xffs.  (Can we say
+	 * ZNYX???) (well sometimes they put in a checksum so we'll
+	 * start at 8).
 	 */
-	if (sc->tulip_if.if_flags & IFF_FULLDUPLEX) {
-	    if (sc->tulip_media != TULIP_MEDIA_10BASET_FD) {
-		sc->tulip_media = TULIP_MEDIA_10BASET_FD;
-		sc->tulip_flags |= TULIP_PRINTMEDIA;
-		sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX;
+	for (idx = 8; idx < 32; idx++) {
+	    if (sc->tulip_rombuf[idx] != 0xFF)
+		return -4;
+	}
+	/*
+	 * Make sure the address is not multicast or locally assigned
+	 * that the OUI is not 00-00-00.
+	 */
+	if ((sc->tulip_rombuf[0] & 3) != 0)
+	    return -4;
+	if (sc->tulip_rombuf[0] == 0 && sc->tulip_rombuf[1] == 0
+		&& sc->tulip_rombuf[2] == 0)
+	    return -4;
+	bcopy(sc->tulip_rombuf, sc->tulip_enaddr, 6);
+	sc->tulip_features |= TULIP_HAVE_OKROM;
+	goto check_oui;
+    } else {
+	/*
+	 * A number of makers of multiport boards (ZNYX and Cogent)
+	 * only put on one address ROM on their 21040 boards.  So
+	 * if the ROM is all zeros (or all 0xFFs), look at the
+	 * previous configured boards (as long as they are on the same
+	 * PCI bus and the bus number is non-zero) until we find the
+	 * master board with address ROM.  We then use its address ROM
+	 * as the base for this board.  (we add our relative board
+	 * to the last byte of its address).
+	 */
+	for (idx = 0; idx < sizeof(sc->tulip_rombuf); idx++) {
+	    if (sc->tulip_rombuf[idx] != 0 && sc->tulip_rombuf[idx] != 0xFF)
+		break;
+	}
+	if (idx == sizeof(sc->tulip_rombuf)) {
+	    int root_unit;
+	    tulip_softc_t *root_sc = NULL;
+	    for (root_unit = sc->tulip_unit - 1; root_unit >= 0; root_unit--) {
+		root_sc = TULIP_UNIT_TO_SOFTC(root_unit);
+		if (root_sc == NULL || (root_sc->tulip_features & (TULIP_HAVE_OKROM|TULIP_HAVE_SLAVEDROM)) == TULIP_HAVE_OKROM)
+		    break;
+		root_sc = NULL;
 	    }
-	} else {
-	    if (sc->tulip_media != TULIP_MEDIA_10BASET) {
-		sc->tulip_media = TULIP_MEDIA_10BASET;
-		sc->tulip_flags |= TULIP_PRINTMEDIA;
-		sc->tulip_cmdmode &= ~TULIP_CMD_FULLDUPLEX;
+	    if (root_sc != NULL && (root_sc->tulip_features & TULIP_HAVE_BASEROM)
+		    && root_sc->tulip_chipid == sc->tulip_chipid
+		    && root_sc->tulip_pci_busno == sc->tulip_pci_busno) {
+		sc->tulip_features |= TULIP_HAVE_SLAVEDROM;
+		sc->tulip_boardsw = root_sc->tulip_boardsw;
+		strcpy(sc->tulip_boardid, root_sc->tulip_boardid);
+		if (sc->tulip_boardsw->bd_type == TULIP_21140_ISV) {
+		    bcopy(root_sc->tulip_rombuf, sc->tulip_rombuf,
+			  sizeof(sc->tulip_rombuf));
+		    if (!tulip_srom_decode(sc))
+			return -5;
+		} else {
+		    bcopy(root_sc->tulip_enaddr, sc->tulip_enaddr, 6);
+		    sc->tulip_enaddr[5] += sc->tulip_unit - root_sc->tulip_unit;
+		}
+		/*
+		 * Now for a truly disgusting kludge: all 4 21040s on
+		 * the ZX314 share the same INTA line so the mapping
+		 * setup by the BIOS on the PCI bridge is worthless.
+		 * Rather than reprogramming the value in the config
+		 * register, we will handle this internally.
+		 */
+		if (root_sc->tulip_features & TULIP_HAVE_SHAREDINTR) {
+		    sc->tulip_slaves = root_sc->tulip_slaves;
+		    root_sc->tulip_slaves = sc;
+		    sc->tulip_features |= TULIP_HAVE_SLAVEDINTR;
+		}
+		return 0;
 	    }
 	}
-	if (sc->tulip_flags & (TULIP_INRESET|TULIP_PRINTMEDIA)) {
-	    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
-	    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_21041_SIACONN_10BASET);
-	    if (sc->tulip_cmdmode & TULIP_CMD_FULLDUPLEX)
-		TULIP_CSR_WRITE(sc, csr_sia_tx_rx,    TULIP_21041_SIATXRX_10BASET_FD);
-	    else 
-		TULIP_CSR_WRITE(sc, csr_sia_tx_rx,    TULIP_21041_SIATXRX_10BASET);
-	    TULIP_CSR_WRITE(sc, csr_sia_general,      TULIP_21041_SIAGEN_10BASET|TULIP_21041_SIAGEN_WATCHDOG);
+    }
+
+    /*
+     * This is the standard DEC address ROM test.
+     */
+
+    if (bcmp(&sc->tulip_rombuf[24], testpat, 8) != 0)
+	return -3;
+
+    tmpbuf[0] = sc->tulip_rombuf[15]; tmpbuf[1] = sc->tulip_rombuf[14];
+    tmpbuf[2] = sc->tulip_rombuf[13]; tmpbuf[3] = sc->tulip_rombuf[12];
+    tmpbuf[4] = sc->tulip_rombuf[11]; tmpbuf[5] = sc->tulip_rombuf[10];
+    tmpbuf[6] = sc->tulip_rombuf[9];  tmpbuf[7] = sc->tulip_rombuf[8];
+    if (bcmp(&sc->tulip_rombuf[0], tmpbuf, 8) != 0)
+	return -2;
+
+    bcopy(sc->tulip_rombuf, sc->tulip_enaddr, 6);
+
+    cksum = *(u_int16_t *) &sc->tulip_enaddr[0];
+    cksum *= 2;
+    if (cksum > 65535) cksum -= 65535;
+    cksum += *(u_int16_t *) &sc->tulip_enaddr[2];
+    if (cksum > 65535) cksum -= 65535;
+    cksum *= 2;
+    if (cksum > 65535) cksum -= 65535;
+    cksum += *(u_int16_t *) &sc->tulip_enaddr[4];
+    if (cksum >= 65535) cksum -= 65535;
+
+    rom_cksum = *(u_int16_t *) &sc->tulip_rombuf[6];
+	
+    if (cksum != rom_cksum)
+	return -1;
+
+  check_oui:
+    /*
+     * Check for various boards based on OUI.  Did I say braindead?
+     */
+    for (idx = 0; tulip_vendors[idx].vendor_identify_nic != NULL; idx++) {
+	if (bcmp((caddr_t) sc->tulip_enaddr,
+		 (caddr_t) tulip_vendors[idx].vendor_oui, 3) == 0) {
+	    (*tulip_vendors[idx].vendor_identify_nic)(sc);
+	    break;
+	}
+    }
+
+    sc->tulip_features |= TULIP_HAVE_OKROM;
+    return 0;
+}
+
+#if defined(IFM_ETHER)
+static void
+tulip_ifmedia_add(
+    tulip_softc_t * const sc)
+{
+    tulip_media_t media;
+    int medias = 0;
+
+    for (media = TULIP_MEDIA_UNKNOWN; media < TULIP_MEDIA_MAX; media++) {
+	if (sc->tulip_mediums[media] != NULL) {
+	    ifmedia_add(&sc->tulip_ifmedia, tulip_media_to_ifmedia[media],
+			0, 0);
+	    medias++;
 	}
-	TULIP_CSR_WRITE(sc, csr_gp_timer, 0); /* disable */
-	sc->tulip_gpticks = 0;
-	sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
-	sc->tulip_intrmask &= ~TULIP_STS_GPTIMEOUT;
-	sc->tulip_flags |= TULIP_LINKUP;
-	sc->tulip_flags &= ~(TULIP_TXPROBE_OK|TULIP_TXPROBE_ACTIVE);
-	sc->tulip_if.if_flags &= ~IFF_OACTIVE;
-	TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
     }
-    if (sc->tulip_flags & TULIP_DEVICEPROBE) {
-	sc->tulip_flags |= TULIP_FAKEGPTIMEOUT;
+    if (medias == 0) {
+	sc->tulip_features |= TULIP_HAVE_NOMEDIA;
+	ifmedia_add(&sc->tulip_ifmedia, IFM_ETHER | IFM_NONE, 0, 0);
+	ifmedia_set(&sc->tulip_ifmedia, IFM_ETHER | IFM_NONE);
+    } else if (sc->tulip_media == TULIP_MEDIA_UNKNOWN) {
+	ifmedia_add(&sc->tulip_ifmedia, IFM_ETHER | IFM_AUTO, 0, 0);
+	ifmedia_set(&sc->tulip_ifmedia, IFM_ETHER | IFM_AUTO);
     } else {
-	TULIP_CSR_WRITE(sc, csr_intr, sc->tulip_intrmask);
-	sc->tulip_flags &= ~TULIP_FAKEGPTIMEOUT;
+	ifmedia_set(&sc->tulip_ifmedia, tulip_media_to_ifmedia[sc->tulip_media]);
+	sc->tulip_flags |= TULIP_PRINTMEDIA;
+	tulip_linkup(sc, sc->tulip_media);
     }
 }
 
-static const tulip_boardsw_t tulip_21041_boardsw = {
-    TULIP_21041_GENERIC,
-    "",
-    tulip_21041_media_probe,
-    tulip_21041_media_select
-};
+static int
+tulip_ifmedia_change(
+    struct ifnet * const ifp)
+{
+    tulip_softc_t * const sc = TULIP_IFP_TO_SOFTC(ifp);
+
+    sc->tulip_flags |= TULIP_NEEDRESET;
+    sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
+    sc->tulip_media = TULIP_MEDIA_UNKNOWN;
+    if (IFM_SUBTYPE(sc->tulip_ifmedia.ifm_media) != IFM_AUTO) {
+	tulip_media_t media;
+	for (media = TULIP_MEDIA_UNKNOWN; media < TULIP_MEDIA_MAX; media++) {
+	    if (sc->tulip_mediums[media] != NULL
+		&& sc->tulip_ifmedia.ifm_media == tulip_media_to_ifmedia[media]) {
+		sc->tulip_flags |= TULIP_PRINTMEDIA;
+		sc->tulip_flags &= ~TULIP_DIDNWAY;
+		tulip_linkup(sc, media);
+		return 0;
+	    }
+	}
+    }
+    sc->tulip_flags &= ~(TULIP_TXPROBE_ACTIVE|TULIP_WANTRXACT);
+    tulip_reset(sc);
+    tulip_init(sc);
+    return 0;
+}
+
+/*
+ * Media status callback
+ */
+static void
+tulip_ifmedia_status(
+    struct ifnet * const ifp,
+    struct ifmediareq *req)
+{
+    tulip_softc_t *sc = TULIP_IFP_TO_SOFTC(ifp);
+
+#if defined(__bsdi__)
+    if (sc->tulip_mii.mii_instance != 0) {
+	mii_pollstat(&sc->tulip_mii);
+	req->ifm_active = sc->tulip_mii.mii_media_active;
+	req->ifm_status = sc->tulip_mii.mii_media_status;
+	return;
+    }
+#endif
+    if (sc->tulip_media == TULIP_MEDIA_UNKNOWN)
+	return;
+
+    req->ifm_status = IFM_AVALID;
+    if (sc->tulip_flags & TULIP_LINKUP)
+	req->ifm_status |= IFM_ACTIVE;
+
+    req->ifm_active = tulip_media_to_ifmedia[sc->tulip_media];
+}
+#endif
+
+static void
+tulip_addr_filter(
+    tulip_softc_t * const sc)
+{
+#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+    struct ifmultiaddr *ifma;
+    u_char *addrp;
+#else
+    struct ether_multistep step;
+    struct ether_multi *enm;
+#endif
+    int multicnt;
+
+    sc->tulip_flags &= ~(TULIP_WANTHASHPERFECT|TULIP_WANTHASHONLY|TULIP_ALLMULTI);
+    sc->tulip_flags |= TULIP_WANTSETUP;
+    sc->tulip_cmdmode &= ~TULIP_CMD_RXRUN;
+    sc->tulip_intrmask &= ~TULIP_STS_RXSTOPPED;
+#if defined(IFF_ALLMULTI)    
+    sc->tulip_if.if_flags &= ~IFF_ALLMULTI;
+#endif
+
+#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+    multicnt = 0;
+    for (ifma = sc->tulip_if.if_multiaddrs.lh_first; ifma != NULL;
+	 ifma = ifma->ifma_link.le_next) {
+
+	    if (ifma->ifma_addr->sa_family == AF_LINK)
+		multicnt++;
+    }
+#else
+    multicnt = sc->tulip_multicnt;
+#endif
+
+    if (multicnt > 14) {
+	u_int32_t *sp = sc->tulip_setupdata;
+	unsigned hash;
+	/*
+	 * Some early passes of the 21140 have broken implementations of
+	 * hash-perfect mode.  When we get too many multicasts for perfect
+	 * filtering with these chips, we need to switch into hash-only
+	 * mode (this is better than all-multicast on network with lots
+	 * of multicast traffic).
+	 */
+	if (sc->tulip_features & TULIP_HAVE_BROKEN_HASH)
+	    sc->tulip_flags |= TULIP_WANTHASHONLY;
+	else
+	    sc->tulip_flags |= TULIP_WANTHASHPERFECT;
+	/*
+	 * If we have more than 14 multicasts, we have
+	 * go into hash perfect mode (512 bit multicast
+	 * hash and one perfect hardware).
+	 */
+	bzero(sc->tulip_setupdata, sizeof(sc->tulip_setupdata));
+
+#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+	for (ifma = sc->tulip_if.if_multiaddrs.lh_first; ifma != NULL;
+	     ifma = ifma->ifma_link.le_next) {
+
+		if (ifma->ifma_addr->sa_family != AF_LINK)
+			continue;
+
+		hash = tulip_mchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
+		sp[hash >> 4] |= 1 << (hash & 0xF);
+	}
+#else
+	ETHER_FIRST_MULTI(step, TULIP_ETHERCOM(sc), enm);
+	while (enm != NULL) {
+		if (bcmp(enm->enm_addrlo, enm->enm_addrhi, 6) == 0) {
+		    hash = tulip_mchash(enm->enm_addrlo);
+		    sp[hash >> 4] |= 1 << (hash & 0xF);
+		} else {
+		    sc->tulip_flags |= TULIP_ALLMULTI;
+		    sc->tulip_flags &= ~(TULIP_WANTHASHONLY|TULIP_WANTHASHPERFECT);
+		    break;
+		}
+		ETHER_NEXT_MULTI(step, enm);
+	}
+#endif
+	/*
+	 * No reason to use a hash if we are going to be
+	 * receiving every multicast.
+	 */
+	if ((sc->tulip_flags & TULIP_ALLMULTI) == 0) {
+	    hash = tulip_mchash(etherbroadcastaddr);
+	    sp[hash >> 4] |= 1 << (hash & 0xF);
+	    if (sc->tulip_flags & TULIP_WANTHASHONLY) {
+		hash = tulip_mchash(sc->tulip_enaddr);
+		sp[hash >> 4] |= 1 << (hash & 0xF);
+	    } else {
+		sp[39] = ((u_int16_t *) sc->tulip_enaddr)[0]; 
+		sp[40] = ((u_int16_t *) sc->tulip_enaddr)[1]; 
+		sp[41] = ((u_int16_t *) sc->tulip_enaddr)[2];
+	    }
+	}
+    }
+    if ((sc->tulip_flags & (TULIP_WANTHASHPERFECT|TULIP_WANTHASHONLY)) == 0) {
+	u_int32_t *sp = sc->tulip_setupdata;
+	int idx = 0;
+	if ((sc->tulip_flags & TULIP_ALLMULTI) == 0) {
+	    /*
+	     * Else can get perfect filtering for 16 addresses.
+	     */
+#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+	    for (ifma = sc->tulip_if.if_multiaddrs.lh_first; ifma != NULL;
+		 ifma = ifma->ifma_link.le_next) {
+		    if (ifma->ifma_addr->sa_family != AF_LINK)
+			    continue;
+		    addrp = LLADDR((struct sockaddr_dl *)ifma->ifma_addr);
+		    *sp++ = ((u_int16_t *) addrp)[0]; 
+		    *sp++ = ((u_int16_t *) addrp)[1]; 
+		    *sp++ = ((u_int16_t *) addrp)[2];
+		    idx++;
+	    }
+#else
+	    ETHER_FIRST_MULTI(step, TULIP_ETHERCOM(sc), enm);
+	    for (; enm != NULL; idx++) {
+		if (bcmp(enm->enm_addrlo, enm->enm_addrhi, 6) == 0) {
+		    *sp++ = ((u_int16_t *) enm->enm_addrlo)[0]; 
+		    *sp++ = ((u_int16_t *) enm->enm_addrlo)[1]; 
+		    *sp++ = ((u_int16_t *) enm->enm_addrlo)[2];
+		} else {
+		    sc->tulip_flags |= TULIP_ALLMULTI;
+		    break;
+		}
+		ETHER_NEXT_MULTI(step, enm);
+	    }
+#endif
+	    /*
+	     * Add the broadcast address.
+	     */
+	    idx++;
+	    *sp++ = 0xFFFF;
+	    *sp++ = 0xFFFF;
+	    *sp++ = 0xFFFF;
+	}
+	/*
+	 * Pad the rest with our hardware address
+	 */
+	for (; idx < 16; idx++) {
+	    *sp++ = ((u_int16_t *) sc->tulip_enaddr)[0]; 
+	    *sp++ = ((u_int16_t *) sc->tulip_enaddr)[1]; 
+	    *sp++ = ((u_int16_t *) sc->tulip_enaddr)[2];
+	}
+    }
+#if defined(IFF_ALLMULTI)
+    if (sc->tulip_flags & TULIP_ALLMULTI)
+	sc->tulip_if.if_flags |= IFF_ALLMULTI;
+#endif
+}
 
 static void
 tulip_reset(
@@ -2096,6 +3050,7 @@ tulip_reset(
 {
     tulip_ringinfo_t *ri;
     tulip_desc_t *di;
+    u_int32_t inreset = (sc->tulip_flags & TULIP_INRESET);
 
     /*
      * Brilliant.  Simply brilliant.  When switching modes/speeds
@@ -2112,21 +3067,22 @@ tulip_reset(
 		   33MHz that comes to two microseconds but wait a
 		   bit longer anyways) */
 
-    sc->tulip_flags |= TULIP_INRESET;
-    sc->tulip_flags &= ~(TULIP_NEEDRESET|TULIP_RXBUFSLOW);
-    sc->tulip_intrmask = 0;
-    TULIP_CSR_WRITE(sc, csr_intr, sc->tulip_intrmask);
+    if (!inreset) {
+	sc->tulip_flags |= TULIP_INRESET;
+	sc->tulip_flags &= ~(TULIP_NEEDRESET|TULIP_RXBUFSLOW);
+	sc->tulip_if.if_flags &= ~IFF_OACTIVE;
+    }
 
     TULIP_CSR_WRITE(sc, csr_txlist, TULIP_KVATOPHYS(sc, &sc->tulip_txinfo.ri_first[0]));
     TULIP_CSR_WRITE(sc, csr_rxlist, TULIP_KVATOPHYS(sc, &sc->tulip_rxinfo.ri_first[0]));
     TULIP_CSR_WRITE(sc, csr_busmode,
-	(1 << (TULIP_BURSTSIZE(sc->tulip_unit) + 8))
-	|TULIP_BUSMODE_CACHE_ALIGN8
-	|(BYTE_ORDER != LITTLE_ENDIAN ? TULIP_BUSMODE_BIGENDIAN : 0));
+		    (1 << (TULIP_BURSTSIZE(sc->tulip_unit) + 8))
+		    |TULIP_BUSMODE_CACHE_ALIGN8
+		    |TULIP_BUSMODE_READMULTIPLE
+		    |(BYTE_ORDER != LITTLE_ENDIAN ? TULIP_BUSMODE_BIGENDIAN : 0));
 
     sc->tulip_txtimer = 0;
     sc->tulip_txq.ifq_maxlen = TULIP_TXDESCS;
-    sc->tulip_if.if_flags &= ~IFF_OACTIVE;
     /*
      * Free all the mbufs that were on the transmit ring.
      */
@@ -2166,24 +3122,29 @@ tulip_reset(
 	m_freem(m);
     }
 
-    (*sc->tulip_boardsw->bd_media_select)(sc);
-#ifdef TULIP_DEBUG
-    if ((sc->tulip_flags & (TULIP_DEVICEPROBE|TULIP_NEEDRESET)) == TULIP_NEEDRESET)
+    /*
+     * If tulip_reset is being called recurisvely, exit quickly knowing
+     * that when the outer tulip_reset returns all the right stuff will
+     * have happened.
+     */
+    if (inreset)
+	return;
+
+    sc->tulip_intrmask |= TULIP_STS_NORMALINTR|TULIP_STS_RXINTR|TULIP_STS_TXINTR
+	|TULIP_STS_ABNRMLINTR|TULIP_STS_SYSERROR|TULIP_STS_TXSTOPPED
+	    |TULIP_STS_TXBABBLE|TULIP_STS_LINKFAIL|TULIP_STS_RXSTOPPED;
+
+    if ((sc->tulip_flags & TULIP_DEVICEPROBE) == 0)
+	(*sc->tulip_boardsw->bd_media_select)(sc);
+#if defined(TULIP_DEBUG)
+    if ((sc->tulip_flags & TULIP_NEEDRESET) == TULIP_NEEDRESET)
 	printf(TULIP_PRINTF_FMT ": tulip_reset: additional reset needed?!?\n",
 	       TULIP_PRINTF_ARGS);
 #endif
-    if ((sc->tulip_flags & (TULIP_LINKUP|TULIP_PRINTMEDIA)) == (TULIP_LINKUP|TULIP_PRINTMEDIA)) {
-	printf(TULIP_PRINTF_FMT ": enabling %s port\n",
-	       TULIP_PRINTF_ARGS,
-	       tulip_mediums[sc->tulip_media]);
-	sc->tulip_flags &= ~TULIP_PRINTMEDIA;
-    }
-    if (sc->tulip_chipid == TULIP_21041)
+    tulip_media_print(sc);
+    if (sc->tulip_features & TULIP_HAVE_DUALSENSE)
 	TULIP_CSR_WRITE(sc, csr_sia_status, TULIP_CSR_READ(sc, csr_sia_status));
 
-    sc->tulip_intrmask |= TULIP_STS_NORMALINTR|TULIP_STS_RXINTR|TULIP_STS_TXINTR
-	|TULIP_STS_ABNRMLINTR|TULIP_STS_SYSERROR|TULIP_STS_TXSTOPPED
-	    |TULIP_STS_TXBABBLE|TULIP_STS_LINKFAIL|TULIP_STS_RXSTOPPED;
     sc->tulip_flags &= ~(TULIP_DOINGSETUP|TULIP_WANTSETUP|TULIP_INRESET
 			 |TULIP_RXACT);
     tulip_addr_filter(sc);
@@ -2200,26 +3161,30 @@ tulip_init(
 	}
 	sc->tulip_if.if_flags |= IFF_RUNNING;
 	if (sc->tulip_if.if_flags & IFF_PROMISC) {
+	    sc->tulip_flags |= TULIP_PROMISC;
 	    sc->tulip_cmdmode |= TULIP_CMD_PROMISCUOUS;
 	} else {
+	    sc->tulip_flags &= ~TULIP_PROMISC;
 	    sc->tulip_cmdmode &= ~TULIP_CMD_PROMISCUOUS;
-	    if (sc->tulip_if.if_flags & IFF_ALLMULTI) {
+	    if (sc->tulip_flags & TULIP_ALLMULTI) {
 		sc->tulip_cmdmode |= TULIP_CMD_ALLMULTI;
 	    } else {
 		sc->tulip_cmdmode &= ~TULIP_CMD_ALLMULTI;
 	    }
 	}
 	sc->tulip_cmdmode |= TULIP_CMD_TXRUN;
-	if ((sc->tulip_flags & TULIP_WANTSETUP) == 0) {
+	if ((sc->tulip_flags & (TULIP_TXPROBE_ACTIVE|TULIP_WANTSETUP)) == 0) {
 	    tulip_rx_intr(sc);
 	    sc->tulip_cmdmode |= TULIP_CMD_RXRUN;
 	    sc->tulip_intrmask |= TULIP_STS_RXSTOPPED;
 	} else {
+	    sc->tulip_if.if_flags |= IFF_OACTIVE;
+	    sc->tulip_cmdmode &= ~TULIP_CMD_RXRUN;
 	    sc->tulip_intrmask &= ~TULIP_STS_RXSTOPPED;
-	    tulip_ifstart(&sc->tulip_if);
 	}
 	TULIP_CSR_WRITE(sc, csr_intr, sc->tulip_intrmask);
 	TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
+	tulip_ifstart(&sc->tulip_if);
     } else {
 	sc->tulip_if.if_flags &= ~IFF_RUNNING;
 	tulip_reset(sc);
@@ -2233,7 +3198,7 @@ tulip_rx_intr(
     tulip_ringinfo_t * const ri = &sc->tulip_rxinfo;
     struct ifnet * const ifp = &sc->tulip_if;
     int fillok = 1;
-#ifdef TULIP_DEBUG
+#if defined(TULIP_DEBUG)
     int cnt = 0;
 #endif
 
@@ -2247,7 +3212,7 @@ tulip_rx_intr(
 	if (fillok && sc->tulip_rxq.ifq_len < TULIP_RXQ_TARGET)
 	    goto queue_mbuf;
 
-#ifdef TULIP_DEBUG
+#if defined(TULIP_DEBUG)
 	if (cnt == ri->ri_max)
 	    break;
 #endif
@@ -2281,7 +3246,7 @@ tulip_rx_intr(
 		if (++eop == ri->ri_last)
 		    eop = ri->ri_first;
 		if (eop == ri->ri_nextout || ((((volatile tulip_desc_t *) eop)->d_status & TULIP_DSTS_OWNER))) {
-#ifdef TULIP_DEBUG
+#if defined(TULIP_DEBUG)
 		    sc->tulip_dbg.dbg_rxintrs++;
 		    sc->tulip_dbg.dbg_rxpktsperintr[cnt]++;
 #endif
@@ -2313,14 +3278,15 @@ tulip_rx_intr(
 	 *  Now get the size of received packet (minus the CRC).
 	 */
 	total_len = ((eop->d_status >> 16) & 0x7FFF) - 4;
-	if ((eop->d_status & TULIP_DSTS_ERRSUM) == 0
+	if ((sc->tulip_flags & TULIP_RXIGNORE) == 0
+		&& ((eop->d_status & TULIP_DSTS_ERRSUM) == 0
 #ifdef BIG_PACKET
-	     || (total_len <= sc->tulip_if.if_mtu + sizeof(struct ether_header) && 
-		 (eop->d_status & (TULIP_DSTS_RxBADLENGTH|TULIP_DSTS_RxRUNT|
-				  TULIP_DSTS_RxCOLLSEEN|TULIP_DSTS_RxBADCRC|
-				  TULIP_DSTS_RxOVERFLOW)) == 0)
+		     || (total_len <= sc->tulip_if.if_mtu + sizeof(struct ether_header) && 
+			 (eop->d_status & (TULIP_DSTS_RxBADLENGTH|TULIP_DSTS_RxRUNT|
+					  TULIP_DSTS_RxCOLLSEEN|TULIP_DSTS_RxBADCRC|
+					  TULIP_DSTS_RxOVERFLOW)) == 0)
 #endif
-		) {
+		)) {
 	    me->m_len = total_len - last_offset;
 	    eh = *mtod(ms, struct ether_header *);
 #if NBPFILTER > 0
@@ -2330,12 +3296,12 @@ tulip_rx_intr(
 		else
 		    TULIP_BPF_MTAP(sc, ms);
 #endif
-	    if ((sc->tulip_if.if_flags & IFF_PROMISC)
+	    sc->tulip_flags |= TULIP_RXACT;
+	    if ((sc->tulip_flags & (TULIP_PROMISC|TULIP_HASHONLY))
 		    && (eh.ether_dhost[0] & 1) == 0
-		    && !TULIP_ADDREQUAL(eh.ether_dhost, sc->tulip_ac.ac_enaddr))
+		    && !TULIP_ADDREQUAL(eh.ether_dhost, sc->tulip_enaddr))
 		    goto next;
 	    accept = 1;
-	    sc->tulip_flags |= TULIP_RXACT;
 	    total_len -= sizeof(struct ether_header);
 	} else {
 	    ifp->if_ierrors++;
@@ -2356,7 +3322,6 @@ tulip_rx_intr(
 			error = "bad crc";
 		    }
 		}
-#ifdef DIAGNOSTIC
 		if (error != NULL && (sc->tulip_flags & TULIP_NOMESSAGES) == 0) {
 		    printf(TULIP_PRINTF_FMT ": receive: " TULIP_EADDR_FMT ": %s\n",
 			   TULIP_PRINTF_ARGS,
@@ -2364,11 +3329,10 @@ tulip_rx_intr(
 			   error);
 		    sc->tulip_flags |= TULIP_NOMESSAGES;
 		}
-#endif
 	    }
 	}
       next:
-#ifdef TULIP_DEBUG
+#if defined(TULIP_DEBUG)
 	cnt++;
 #endif
 	ifp->if_ipackets++;
@@ -2405,7 +3369,11 @@ tulip_rx_intr(
 		}
 #endif
 	    }
-	    if (accept) {
+	    if (accept
+#if defined(TULIP_COPY_RXDATA)
+		&& m0 != NULL
+#endif
+		) {
 #if defined(__bsdi__)
 		eh.ether_type = ntohs(eh.ether_type);
 #endif
@@ -2439,7 +3407,7 @@ tulip_rx_intr(
 	     */
 	    fillok = 0;
 	    sc->tulip_flags |= TULIP_RXBUFSLOW;
-#ifdef TULIP_DEBUG
+#if defined(TULIP_DEBUG)
 	    sc->tulip_dbg.dbg_rxlowbufs++;
 #endif
 	    continue;
@@ -2463,7 +3431,7 @@ tulip_rx_intr(
 	    sc->tulip_flags &= ~TULIP_RXBUFSLOW;
     }
 
-#ifdef TULIP_DEBUG
+#if defined(TULIP_DEBUG)
     sc->tulip_dbg.dbg_rxintrs++;
     sc->tulip_dbg.dbg_rxpktsperintr[cnt]++;
 #endif
@@ -2485,53 +3453,64 @@ tulip_tx_intr(
 	    if (ri->ri_nextin->d_flag & TULIP_DFLAG_TxSETUPPKT) {
 		/*
 		 * We've just finished processing a setup packet.
-		 * Mark that we can finished it.  If there's not
+		 * Mark that we finished it.  If there's not
 		 * another pending, startup the TULIP receiver.
 		 * Make sure we ack the RXSTOPPED so we won't get
 		 * an abormal interrupt indication.
 		 */
-		sc->tulip_flags &= ~TULIP_DOINGSETUP;
-		if ((sc->tulip_flags & TULIP_WANTSETUP) == 0) {
+		sc->tulip_flags &= ~(TULIP_DOINGSETUP|TULIP_HASHONLY);
+		if (ri->ri_nextin->d_flag & TULIP_DFLAG_TxINVRSFILT)
+		    sc->tulip_flags |= TULIP_HASHONLY;
+		if ((sc->tulip_flags & (TULIP_WANTSETUP|TULIP_TXPROBE_ACTIVE)) == 0) {
 		    tulip_rx_intr(sc);
 		    sc->tulip_cmdmode |= TULIP_CMD_RXRUN;
 		    sc->tulip_intrmask |= TULIP_STS_RXSTOPPED;
 		    TULIP_CSR_WRITE(sc, csr_status, TULIP_STS_RXSTOPPED);
-		    if ((sc->tulip_flags & TULIP_TXPROBE_ACTIVE) == 0)
-			TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
 		    TULIP_CSR_WRITE(sc, csr_intr, sc->tulip_intrmask);
+		    TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
 		}
 	    } else {
-		tulip_desc_t * eop = ri->ri_nextin;
+		tulip_desc_t * const nextin = ri->ri_nextin;
 		IF_DEQUEUE(&sc->tulip_txq, m);
 		m_freem(m);
-		xmits++;
 		if (sc->tulip_flags & TULIP_TXPROBE_ACTIVE) {
-		    if ((eop->d_status & (TULIP_DSTS_TxNOCARR|TULIP_DSTS_TxEXCCOLL)) == 0)
-			sc->tulip_flags |= TULIP_TXPROBE_OK;
-		    (*sc->tulip_boardsw->bd_media_select)(sc);
-		    if (sc->tulip_chipid == TULIP_21041)
-			TULIP_CSR_WRITE(sc, csr_sia_status, TULIP_CSR_READ(sc, csr_sia_status));
+		    tulip_mediapoll_event_t event = TULIP_MEDIAPOLL_TXPROBE_OK;
+		    if (nextin->d_status & (TULIP_DSTS_TxNOCARR|TULIP_DSTS_TxEXCCOLL)) {
+#if defined(TULIP_DEBUG)
+			if (nextin->d_status & TULIP_DSTS_TxNOCARR)
+			    sc->tulip_dbg.dbg_txprobe_nocarr++;
+			if (nextin->d_status & TULIP_DSTS_TxEXCCOLL)
+			    sc->tulip_dbg.dbg_txprobe_exccoll++;
+#endif
+			event = TULIP_MEDIAPOLL_TXPROBE_FAILED;
+		    }
+		    (*sc->tulip_boardsw->bd_media_poll)(sc, event);
+		    /*
+		     * Escape from the loop before media poll has reset the TULIP!
+		     */
+		    break;
 		} else {
-		    if (eop->d_status & TULIP_DSTS_ERRSUM) {
+		    xmits++;
+		    if (nextin->d_status & TULIP_DSTS_ERRSUM) {
 			sc->tulip_if.if_oerrors++;
-			if (eop->d_status & TULIP_DSTS_TxEXCCOLL)
+			if (nextin->d_status & TULIP_DSTS_TxEXCCOLL)
 			    sc->tulip_dot3stats.dot3StatsExcessiveCollisions++;
-			if (eop->d_status & TULIP_DSTS_TxLATECOLL)
+			if (nextin->d_status & TULIP_DSTS_TxLATECOLL)
 			    sc->tulip_dot3stats.dot3StatsLateCollisions++;
-			if (eop->d_status & (TULIP_DSTS_TxNOCARR|TULIP_DSTS_TxCARRLOSS))
+			if (nextin->d_status & (TULIP_DSTS_TxNOCARR|TULIP_DSTS_TxCARRLOSS))
 			    sc->tulip_dot3stats.dot3StatsCarrierSenseErrors++;
-			if (eop->d_status & (TULIP_DSTS_TxUNDERFLOW|TULIP_DSTS_TxBABBLE))
+			if (nextin->d_status & (TULIP_DSTS_TxUNDERFLOW|TULIP_DSTS_TxBABBLE))
 			    sc->tulip_dot3stats.dot3StatsInternalMacTransmitErrors++;
 		    } else {
 			u_int32_t collisions = 
-			    (eop->d_status & TULIP_DSTS_TxCOLLMASK)
+			    (nextin->d_status & TULIP_DSTS_TxCOLLMASK)
 				>> TULIP_DSTS_V_TxCOLLCNT;
 			sc->tulip_if.if_collisions += collisions;
 			if (collisions == 1)
 			    sc->tulip_dot3stats.dot3StatsSingleCollisionFrames++;
 			else if (collisions > 1)
 			    sc->tulip_dot3stats.dot3StatsMultipleCollisionFrames++;
-			else if (eop->d_status & TULIP_DSTS_TxDEFERRED)
+			else if (nextin->d_status & TULIP_DSTS_TxDEFERRED)
 			    sc->tulip_dot3stats.dot3StatsDeferredTransmissions++;
 			/*
 			 * SQE is only valid for 10baseT/BNC/AUI when not
@@ -2539,7 +3518,7 @@ tulip_tx_intr(
 			 * test, the corresponding bit in tulip_flags needs to
 			 * set as well to get us to count SQE Test Errors.
 			 */
-			if (eop->d_status & TULIP_DSTS_TxNOHRTBT & sc->tulip_flags)
+			if (nextin->d_status & TULIP_DSTS_TxNOHRTBT & sc->tulip_flags)
 			    sc->tulip_dot3stats.dot3StatsSQETestErrors++;
 		    }
 		}
@@ -2548,8 +3527,10 @@ tulip_tx_intr(
 
 	if (++ri->ri_nextin == ri->ri_last)
 	    ri->ri_nextin = ri->ri_first;
+
 	ri->ri_free++;
-	sc->tulip_if.if_flags &= ~IFF_OACTIVE;
+	if ((sc->tulip_flags & TULIP_TXPROBE_ACTIVE) == 0)
+	    sc->tulip_if.if_flags &= ~IFF_OACTIVE;
     }
     /*
      * If nothing left to transmit, disable the timer.
@@ -2606,24 +3587,45 @@ tulip_intr_handler(
 	    sc->tulip_system_errors++;
 	    break;
 	}
-	if (csr & (TULIP_STS_GPTIMEOUT|TULIP_STS_LINKPASS|TULIP_STS_LINKFAIL)) {
+	if (csr & (TULIP_STS_LINKPASS|TULIP_STS_LINKFAIL)) {
 #if defined(TULIP_DEBUG)
-	    sc->tulip_dbg.dbg_gpintrs++;
-#endif
-	    if (sc->tulip_chipid == TULIP_21041) {
-		(*sc->tulip_boardsw->bd_media_select)(sc);
-		if (csr & (TULIP_STS_LINKPASS|TULIP_STS_LINKFAIL))
-		    csr &= ~TULIP_STS_ABNRMLINTR;
-		TULIP_CSR_WRITE(sc, csr_sia_status, TULIP_CSR_READ(sc, csr_sia_status));
-	    } else if (sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) {
-		(*sc->tulip_boardsw->bd_media_select)(sc);
-		csr &= ~(TULIP_STS_ABNRMLINTR|TULIP_STS_GPTIMEOUT);
+	    sc->tulip_dbg.dbg_link_intrs++;
+#endif
+	    if (sc->tulip_boardsw->bd_media_poll != NULL) {
+		(*sc->tulip_boardsw->bd_media_poll)(sc, csr & TULIP_STS_LINKFAIL
+						    ? TULIP_MEDIAPOLL_LINKFAIL
+						    : TULIP_MEDIAPOLL_LINKPASS);
+		csr &= ~TULIP_STS_ABNRMLINTR;
 	    }
-	    if ((sc->tulip_flags & (TULIP_LINKUP|TULIP_PRINTMEDIA)) == (TULIP_LINKUP|TULIP_PRINTMEDIA)) {
-		printf(TULIP_PRINTF_FMT ": enabling %s port\n",
-		       TULIP_PRINTF_ARGS,
-		       tulip_mediums[sc->tulip_media]);
-		sc->tulip_flags &= ~TULIP_PRINTMEDIA;
+	    tulip_media_print(sc);
+	}
+	if (csr & (TULIP_STS_RXINTR|TULIP_STS_RXNOBUF)) {
+	    u_int32_t misses = TULIP_CSR_READ(sc, csr_missed_frames);
+	    if (csr & TULIP_STS_RXNOBUF)
+		sc->tulip_dot3stats.dot3StatsMissedFrames += misses & 0xFFFF;
+	    /*
+	     * Pass 2.[012] of the 21140A-A[CDE] may hang and/or corrupt data
+	     * on receive overflows.
+	     */
+	   if ((misses & 0x0FFE0000) && (sc->tulip_features & TULIP_HAVE_RXBADOVRFLW)) {
+		sc->tulip_dot3stats.dot3StatsInternalMacReceiveErrors++;
+		/*
+		 * Stop the receiver process and spin until it's stopped.
+		 * Tell rx_intr to drop the packets it dequeues.
+		 */
+		TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode & ~TULIP_CMD_RXRUN);
+		while ((TULIP_CSR_READ(sc, csr_status) & TULIP_STS_RXSTOPPED) == 0)
+		    ;
+		TULIP_CSR_WRITE(sc, csr_status, TULIP_STS_RXSTOPPED);
+		sc->tulip_flags |= TULIP_RXIGNORE;
+	    }
+	    tulip_rx_intr(sc);
+	    if (sc->tulip_flags & TULIP_RXIGNORE) {
+		/*
+		 * Restart the receiver.
+		 */
+		sc->tulip_flags &= ~TULIP_RXIGNORE;
+		TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
 	    }
 	}
 	if (csr & TULIP_STS_ABNRMLINTR) {
@@ -2637,12 +3639,6 @@ tulip_intr_handler(
 	    }
 	    TULIP_CSR_WRITE(sc, csr_command, sc->tulip_cmdmode);
 	}
-	if (csr & (TULIP_STS_RXINTR|TULIP_STS_RXNOBUF)) {
-	    tulip_rx_intr(sc);
-	    if (csr & TULIP_STS_RXNOBUF)
-		sc->tulip_dot3stats.dot3StatsMissedFrames +=
-		    TULIP_CSR_READ(sc, csr_missed_frames) & 0xFFFF;
-	}
 	if (sc->tulip_txinfo.ri_free < sc->tulip_txinfo.ri_max) {
 	    tulip_tx_intr(sc);
 	    if ((sc->tulip_flags & TULIP_TXPROBE_ACTIVE) == 0)
@@ -2701,10 +3697,10 @@ tulip_softintr(
     /*
      * Copy mask to local copy and reset global one to 0.
      */
-    s = splimp();
+    s = TULIP_RAISESPL();
     softintr_mask = tulip_softintr_mask;
     tulip_softintr_mask = 0;
-    splx(s);
+    TULIP_RESTORESPL(s);
 
     /*
      * Optimize for the single unit case.
@@ -2715,6 +3711,7 @@ tulip_softintr(
 	    /*
 	     * Handle the "interrupt" and then reenable interrupts
 	     */
+	    softintr_mask = 0;
 	    tulip_intr_handler(sc, &progress);
 	    TULIP_CSR_WRITE(sc, csr_intr, sc->tulip_intrmask);
 	}
@@ -2738,9 +3735,9 @@ tulip_softintr(
 	    /*
 	     * Handle the "interrupt" and then reenable interrupts
 	     */
+	    softintr_mask ^= mask;
 	    tulip_intr_handler(sc, &progress);
 	    TULIP_CSR_WRITE(sc, csr_intr, sc->tulip_intrmask);
-	    softintr_mask ^= mask;
 	}
     }
 
@@ -2800,576 +3797,9 @@ tulip_intr_normal(
 }
 
 /*
- * 
- */
-
-static void
-tulip_delay_300ns(
-    tulip_softc_t * const sc)
-{
-    int idx;
-    for (idx = (300 / 33) + 1; idx > 0; idx--)
-	TULIP_CSR_READ(sc, csr_busmode);
-}
-
-#define EMIT    do { TULIP_CSR_WRITE(sc, csr_srom_mii, csr); tulip_delay_300ns(sc); } while (0)
-
-static void
-tulip_srom_idle(
-    tulip_softc_t * const sc)
-{
-    unsigned bit, csr;
-    
-    csr  = SROMSEL ; EMIT;
-    csr  = SROMSEL | SROMRD; EMIT;  
-    csr ^= SROMCS; EMIT;
-    csr ^= SROMCLKON; EMIT;
-
-    /*
-     * Write 25 cycles of 0 which will force the SROM to be idle.
-     */
-    for (bit = 3 + SROM_BITWIDTH + 16; bit > 0; bit--) {
-        csr ^= SROMCLKOFF; EMIT;    /* clock low; data not valid */
-        csr ^= SROMCLKON; EMIT;     /* clock high; data valid */
-    }
-    csr ^= SROMCLKOFF; EMIT;
-    csr ^= SROMCS; EMIT;
-    csr  = 0; EMIT;
-}
-
-     
-static void
-tulip_srom_read(
-    tulip_softc_t * const sc)
-{   
-    int idx; 
-    const unsigned bitwidth = SROM_BITWIDTH;
-    const unsigned cmdmask = (SROMCMD_RD << bitwidth);
-    const unsigned msb = 1 << (bitwidth + 3 - 1);
-    unsigned lastidx = (1 << bitwidth) - 1;
-
-    tulip_srom_idle(sc);
-
-    for (idx = 0; idx <= lastidx; idx++) {
-        unsigned lastbit, data, bits, bit, csr;
-	csr  = SROMSEL ;	        EMIT;
-        csr  = SROMSEL | SROMRD;        EMIT;
-        csr ^= SROMCSON;                EMIT;
-        csr ^=            SROMCLKON;    EMIT;
-    
-        lastbit = 0;
-        for (bits = idx|cmdmask, bit = bitwidth + 3; bit > 0; bit--, bits <<= 1) {
-            const unsigned thisbit = bits & msb;
-            csr ^= SROMCLKOFF; EMIT;    /* clock low; data not valid */
-            if (thisbit != lastbit) {
-                csr ^= SROMDOUT; EMIT;  /* clock low; invert data */
-            } else {
-		EMIT;
-	    }
-            csr ^= SROMCLKON; EMIT;     /* clock high; data valid */
-            lastbit = thisbit;
-        }
-        csr ^= SROMCLKOFF; EMIT;
-
-        for (data = 0, bits = 0; bits < 16; bits++) {
-            data <<= 1;
-            csr ^= SROMCLKON; EMIT;     /* clock high; data valid */ 
-            data |= TULIP_CSR_READ(sc, csr_srom_mii) & SROMDIN ? 1 : 0;
-            csr ^= SROMCLKOFF; EMIT;    /* clock low; data not valid */
-        }
-	sc->tulip_rombuf[idx*2] = data & 0xFF;
-	sc->tulip_rombuf[idx*2+1] = data >> 8;
-	csr  = SROMSEL | SROMRD; EMIT;
-	csr  = 0; EMIT;
-    }
-    tulip_srom_idle(sc);
-}
-
-#define MII_EMIT    do { TULIP_CSR_WRITE(sc, csr_srom_mii, csr); tulip_delay_300ns(sc); } while (0)
-
-static void
-tulip_mii_sendbits(
-    tulip_softc_t * const sc,
-    unsigned data,
-    unsigned bits)
-{
-    unsigned msb = 1 << (bits - 1);
-    unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK);
-    unsigned lastbit = (csr & MII_DOUT) ? msb : 0;
-
-    csr |= MII_WR; MII_EMIT;  		/* clock low; assert write */
-
-    for (; bits > 0; bits--, data <<= 1) {
-	const unsigned thisbit = data & msb;
-	if (thisbit != lastbit) {
-	    csr ^= MII_DOUT; MII_EMIT;  /* clock low; invert data */
-	}
-	csr ^= MII_CLKON; MII_EMIT;     /* clock high; data valid */
-	lastbit = thisbit;
-	csr ^= MII_CLKOFF; MII_EMIT;    /* clock low; data not valid */
-    }
-}
-
-static void
-tulip_mii_turnaround(
-    tulip_softc_t * const sc,
-    unsigned cmd)
-{
-    unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK);
-
-    if (cmd == MII_WRCMD) {
-	csr |= MII_DOUT; MII_EMIT;	/* clock low; change data */
-	csr ^= MII_CLKON; MII_EMIT;	/* clock high; data valid */
-	csr ^= MII_CLKOFF; MII_EMIT;	/* clock low; data not valid */
-	csr ^= MII_DOUT; MII_EMIT;	/* clock low; change data */
-    } else {
-	csr |= MII_RD; MII_EMIT;	/* clock low; switch to read */
-    }
-    csr ^= MII_CLKON; MII_EMIT;		/* clock high; data valid */
-    csr ^= MII_CLKOFF; MII_EMIT;	/* clock low; data not valid */
-}
-
-static unsigned
-tulip_mii_readbits(
-    tulip_softc_t * const sc)
-{
-    unsigned data;
-    unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK);
-    int idx;
-
-    for (idx = 0, data = 0; idx < 16; idx++) {
-	data <<= 1;	/* this is NOOP on the first pass through */
-	csr ^= MII_CLKON; MII_EMIT;	/* clock high; data valid */
-	if (TULIP_CSR_READ(sc, csr_srom_mii) & MII_DIN)
-	    data |= 1;
-	csr ^= MII_CLKOFF; MII_EMIT;	/* clock low; data not valid */
-    }
-    csr ^= MII_RD; MII_EMIT;		/* clock low; turn off read */
-
-    return data;
-}
-
-static unsigned
-tulip_mii_readreg(
-    tulip_softc_t * const sc,
-    unsigned devaddr,
-    unsigned regno)
-{
-    unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK);
-    unsigned data;
-
-    csr &= ~(MII_RD|MII_CLK); MII_EMIT;
-    tulip_mii_sendbits(sc, MII_PREAMBLE, 32);
-    tulip_mii_sendbits(sc, MII_RDCMD, 8);
-    tulip_mii_sendbits(sc, devaddr, 5);
-    tulip_mii_sendbits(sc, regno, 5);
-    tulip_mii_turnaround(sc, MII_RDCMD);
-
-    data = tulip_mii_readbits(sc);
-#ifdef TULIP_DEBUG
-    sc->tulip_dbg.dbg_phyregs[regno][0] = data;
-    sc->tulip_dbg.dbg_phyregs[regno][1]++;
-#endif
-    return data;
-}
-
-static void
-tulip_mii_writereg(
-    tulip_softc_t * const sc,
-    unsigned devaddr,
-    unsigned regno,
-    unsigned data)
-{
-    unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK);
-    csr &= ~(MII_RD|MII_CLK); MII_EMIT;
-    tulip_mii_sendbits(sc, MII_PREAMBLE, 32);
-    tulip_mii_sendbits(sc, MII_WRCMD, 8);
-    tulip_mii_sendbits(sc, devaddr, 5);
-    tulip_mii_sendbits(sc, regno, 5);
-    tulip_mii_turnaround(sc, MII_WRCMD);
-    tulip_mii_sendbits(sc, data, 16);
-#ifdef TULIP_DEBUG
-    sc->tulip_dbg.dbg_phyregs[regno][2] = data;
-    sc->tulip_dbg.dbg_phyregs[regno][3]++;
-#endif
-}
-
-#define	tulip_mchash(mca)	(tulip_crc32(mca, 6) & 0x1FF)
-#define	tulip_srom_crcok(databuf)	( \
-    ((tulip_crc32(databuf, 126) & 0xFFFF) ^ 0xFFFF)== \
-     ((databuf)[126] | ((databuf)[127] << 8)))
-
-static unsigned
-tulip_crc32(
-    const unsigned char *databuf,
-    size_t datalen)
-{
-    u_int idx, bit, data, crc = 0xFFFFFFFFUL;
-
-    for (idx = 0; idx < datalen; idx++)
-        for (data = *databuf++, bit = 0; bit < 8; bit++, data >>= 1)
-            crc = (crc >> 1) ^ (((crc ^ data) & 1) ? TULIP_CRC32_POLY : 0);
-    return crc;
-}
-
-static void
-tulip_identify_smc_nic(
-    tulip_softc_t *sc)
-{
-    u_int32_t id1, id2, ei;
-    int auibnc = 0, utp = 0;
-    char *cp;
-
-    if (sc->tulip_chipid == TULIP_21041)
-	return;
-    if (sc->tulip_chipid == TULIP_21140) {
-	sc->tulip_boardsw = &tulip_21140_smc9332_boardsw;
-	return;
-    }
-    if (sc->tulip_chipid == TULIP_21140A) {
-	sc->tulip_boardsw = &tulip_21140A_smc9332bdt_boardsw;
-	return;
-    }
-    id1 = sc->tulip_rombuf[0x60] | (sc->tulip_rombuf[0x61] << 8);
-    id2 = sc->tulip_rombuf[0x62] | (sc->tulip_rombuf[0x63] << 8);
-    ei  = sc->tulip_rombuf[0x66] | (sc->tulip_rombuf[0x67] << 8);
-
-    strcpy(sc->tulip_boardidbuf, "SMC 8432");
-    cp = &sc->tulip_boardidbuf[8];
-    if ((id1 & 1) == 0)
-	*cp++ = 'B', auibnc = 1;
-    if ((id1 & 0xFF) > 0x32)
-	*cp++ = 'T', utp = 1;
-    if ((id1 & 0x4000) == 0)
-	*cp++ = 'A', auibnc = 1;
-    if (id2 == 0x15) {
-	sc->tulip_boardidbuf[7] = '4';
-	*cp++ = '-';
-	*cp++ = 'C';
-	*cp++ = 'H';
-	*cp++ = (ei ? '2' : '1');
-    }
-    *cp++ = ' ';
-    *cp = '\0';
-    if (utp && !auibnc)
-	sc->tulip_boardsw = &tulip_21040_10baset_only_boardsw;
-    else if (!utp && auibnc)
-	sc->tulip_boardsw = &tulip_21040_auibnc_only_boardsw;
-}
-
-/*
- * This deals with the vagaries of the address roms and the
- * brain-deadness that various vendors commit in using them.
- */
-static int
-tulip_read_macaddr(
-    tulip_softc_t *sc)
-{
-    int cksum, rom_cksum, idx;
-    u_int32_t csr;
-    unsigned char tmpbuf[8];
-    static const u_char testpat[] = { 0xFF, 0, 0x55, 0xAA, 0xFF, 0, 0x55, 0xAA };
-
-    if (sc->tulip_chipid == TULIP_21040) {
-	TULIP_CSR_WRITE(sc, csr_enetrom, 1);
-	for (idx = 0; idx < sizeof(sc->tulip_rombuf); idx++) {
-	    int cnt = 0;
-	    while (((csr = TULIP_CSR_READ(sc, csr_enetrom)) & 0x80000000L) && cnt < 10000)
-		cnt++;
-	    sc->tulip_rombuf[idx] = csr & 0xFF;
-	}
-	sc->tulip_boardsw = &tulip_21040_boardsw;
-#if defined(TULIP_EISA)
-    } else if (sc->tulip_chipid == TULIP_DE425) {
-	int cnt;
-	for (idx = 0, cnt = 0; idx < sizeof(testpat) && cnt < 32; cnt++) {
-	    tmpbuf[idx] = TULIP_CSR_READBYTE(sc, csr_enetrom);
-	    if (tmpbuf[idx] == testpat[idx])
-		++idx;
-	    else
-		idx = 0;
-	}
-	for (idx = 0; idx < 32; idx++)
-	    sc->tulip_rombuf[idx] = TULIP_CSR_READBYTE(sc, csr_enetrom);
-	sc->tulip_boardsw = &tulip_21040_boardsw;
-#endif /* TULIP_EISA */
-    } else {
-	int new_srom_fmt = 0;
-	/*
-	 * Thankfully all 21041's act the same.
-	 * Assume all 21140 board are compatible with the
-	 * DEC 10/100 evaluation board.  Not really valid but
-	 * it's the best we can do until every one switches to
-	 * the new SROM format.
-	 */
-	if (sc->tulip_chipid == TULIP_21041)
-	    sc->tulip_boardsw = &tulip_21041_boardsw;
-	else
-	    sc->tulip_boardsw = &tulip_21140_eb_boardsw;
-	tulip_srom_read(sc);
-	if (tulip_srom_crcok(sc->tulip_rombuf)) {
-	    /*
-	     * SROM CRC is valid therefore it must be in the
-	     * new format.
-	     */
-	    new_srom_fmt = 1;
-	} else if (sc->tulip_rombuf[126] == 0xff && sc->tulip_rombuf[127] == 0xFF) {
-	    /*
-	     * No checksum is present.  See if the SROM id checks out;
-	     * the first 18 bytes should be 0 followed by a 1 followed
-	     * by the number of adapters (which we don't deal with yet).
-	     */
-	    for (idx = 0; idx < 18; idx++) {
-		if (sc->tulip_rombuf[idx] != 0)
-		    break;
-	    }
-	    if (idx == 18 && sc->tulip_rombuf[18] == 1 && sc->tulip_rombuf[19] != 0)
-		new_srom_fmt = 2;
-	}
-	if (new_srom_fmt) {
-	    int copy_name = 0;
-	    /*
-	     * New SROM format.  Copy out the Ethernet address.
-	     * If it contains a DE500-XA string, then it must be
-	     * a DE500-XA.
-	     */
-	    bcopy(sc->tulip_rombuf + 20, sc->tulip_hwaddr, 6);
-	    if (bcmp(sc->tulip_rombuf + 29, "DE500-XA", 8) == 0) {
-		sc->tulip_boardsw = &tulip_21140_de500xa_boardsw;
-		copy_name = 1;
-	    } else if (bcmp(sc->tulip_rombuf + 29, "DE500-AA", 8) == 0) {
-		sc->tulip_boardsw = &tulip_21140_de500aa_boardsw;
-		copy_name = 1;
-	    } else if (bcmp(sc->tulip_rombuf + 52, "EN1207TX", 8) == 0) {
-		sc->tulip_boardsw = &tulip_21140_de500aa_boardsw;
-		copy_name = 1;
-	    } else if (bcmp(sc->tulip_rombuf + 29, "DE450", 5) == 0) {
-		copy_name = 1;
-	    } else if (bcmp(sc->tulip_hwaddr, "\x00\x00\xf4\x90", 4) == 0) {
-		sc->tulip_boardsw = &tulip_21140_de500aa_boardsw;
-		strcpy(sc->tulip_boardidbuf, "LA100-PCI ");
-		sc->tulip_boardid = sc->tulip_boardidbuf;
-	    }
-	    if (copy_name) {
-		bcopy(sc->tulip_rombuf + 29, sc->tulip_boardidbuf, 8);
-		sc->tulip_boardidbuf[8] = ' ';
-		sc->tulip_boardid = sc->tulip_boardidbuf;
-	    }
-	    if (sc->tulip_boardsw == NULL)
-		return -6;
-	    goto check_oui;
-	}
-    }
-
-
-    if (bcmp(&sc->tulip_rombuf[0], &sc->tulip_rombuf[16], 8) != 0) {
-	/*
-	 * Some folks don't use the standard ethernet rom format
-	 * but instead just put the address in the first 6 bytes
-	 * of the rom and let the rest be all 0xffs.  (Can we say
-	 * ZNYX???) (well sometimes they put in a checksum so we'll
-	 * start at 8).
-	 */
-	for (idx = 8; idx < 32; idx++) {
-	    if (sc->tulip_rombuf[idx] != 0xFF)
-		return -4;
-	}
-	/*
-	 * Make sure the address is not multicast or locally assigned
-	 * that the OUI is not 00-00-00.
-	 */
-	if ((sc->tulip_rombuf[0] & 3) != 0)
-	    return -4;
-	if (sc->tulip_rombuf[0] == 0 && sc->tulip_rombuf[1] == 0
-		&& sc->tulip_rombuf[2] == 0)
-	    return -4;
-	bcopy(sc->tulip_rombuf, sc->tulip_hwaddr, 6);
-	sc->tulip_flags |= TULIP_ROMOK;
-	goto check_oui;
-    } else {
-	/*
-	 * A number of makers of multiport boards (ZNYX and Cogent)
-	 * only put on one address ROM on their 21040 boards.  So
-	 * if the ROM is all zeros and this is a 21040, look at the
-	 * previous configured boards (as long as they are on the same
-	 * PCI bus and the bus number is non-zero) until we find the
-	 * master board with address ROM.  We then use its address ROM
-	 * as the base for this board.  (we add our relative board
-	 * to the last byte of its address).
-	 */
-	if (sc->tulip_chipid == TULIP_21040 /* && sc->tulip_bus != 0 XXX */) {
-	    for (idx = 0; idx < 32; idx++) {
-		if (sc->tulip_rombuf[idx] != 0)
-		    break;
-	    }
-	    if (idx == 32) {
-		int root_unit;
-		tulip_softc_t *root_sc = NULL;
-		for (root_unit = sc->tulip_unit - 1; root_unit >= 0; root_unit--) {
-		    root_sc = TULIP_UNIT_TO_SOFTC(root_unit);
-		    if (root_sc == NULL || (root_sc->tulip_flags & (TULIP_ROMOK|TULIP_SLAVEDROM)) == TULIP_ROMOK)
-			break;
-		    root_sc = NULL;
-		}
-		if (root_sc != NULL
-			/* && root_sc->tulip_bus == sc->tulip_bus XXX */) {
-		    bcopy(root_sc->tulip_hwaddr, sc->tulip_hwaddr, 6);
-		    sc->tulip_hwaddr[5] += sc->tulip_unit - root_sc->tulip_unit;
-		    sc->tulip_flags |= TULIP_SLAVEDROM;
-		    if (root_sc->tulip_boardsw->bd_type == TULIP_21040_ZX314_MASTER) {
-			sc->tulip_boardsw = &tulip_21040_zx314_slave_boardsw;
-			/*
-			 * Now for a truly disgusting kludge: all 4 21040s on
-			 * the ZX314 share the same INTA line so the mapping
-			 * setup by the BIOS on the PCI bridge is worthless.
-			 * Rather than reprogramming the value in the config
-			 * register, we will handle this internally.
-			 */
-			sc->tulip_slaves = root_sc->tulip_slaves;
-			root_sc->tulip_slaves = sc;
-			sc->tulip_flags |= TULIP_SLAVEDINTR;
-		    }
-		    return 0;
-		}
-	    }
-	}
-    }
-
-    /*
-     * This is the standard DEC address ROM test.
-     */
-
-    if (bcmp(&sc->tulip_rombuf[24], testpat, 8) != 0)
-	return -3;
-
-    tmpbuf[0] = sc->tulip_rombuf[15]; tmpbuf[1] = sc->tulip_rombuf[14];
-    tmpbuf[2] = sc->tulip_rombuf[13]; tmpbuf[3] = sc->tulip_rombuf[12];
-    tmpbuf[4] = sc->tulip_rombuf[11]; tmpbuf[5] = sc->tulip_rombuf[10];
-    tmpbuf[6] = sc->tulip_rombuf[9];  tmpbuf[7] = sc->tulip_rombuf[8];
-    if (bcmp(&sc->tulip_rombuf[0], tmpbuf, 8) != 0)
-	return -2;
-
-    bcopy(sc->tulip_rombuf, sc->tulip_hwaddr, 6);
-
-    cksum = *(u_int16_t *) &sc->tulip_hwaddr[0];
-    cksum *= 2;
-    if (cksum > 65535) cksum -= 65535;
-    cksum += *(u_int16_t *) &sc->tulip_hwaddr[2];
-    if (cksum > 65535) cksum -= 65535;
-    cksum *= 2;
-    if (cksum > 65535) cksum -= 65535;
-    cksum += *(u_int16_t *) &sc->tulip_hwaddr[4];
-    if (cksum >= 65535) cksum -= 65535;
-
-    rom_cksum = *(u_int16_t *) &sc->tulip_rombuf[6];
-	
-    if (cksum != rom_cksum)
-	return -1;
-
-  check_oui:
-    /*
-     * Check for various boards based on OUI.  Did I say braindead?
-     */
-   if (sc->tulip_hwaddr[0] == TULIP_OUI_COGENT_0
-	    && sc->tulip_hwaddr[1] == TULIP_OUI_COGENT_1
-	    && sc->tulip_hwaddr[2] == TULIP_OUI_COGENT_2) {
-	if (sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) {
-	    if (sc->tulip_rombuf[32] == TULIP_COGENT_EM100_ID)
-		sc->tulip_boardsw = &tulip_21140_cogent_em100_boardsw;
-	}
-    } else if (sc->tulip_hwaddr[0] == TULIP_OUI_ZNYX_0
-	    && sc->tulip_hwaddr[1] == TULIP_OUI_ZNYX_1
-	    && sc->tulip_hwaddr[2] == TULIP_OUI_ZNYX_2) {
-	if (sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) {
-	    /* this at least works for the zx342 from Znyx */
-	    sc->tulip_boardsw = &tulip_21140_znyx_zx34x_boardsw;
-	} else if (sc->tulip_chipid == TULIP_21040
-	        && (sc->tulip_hwaddr[3] & ~3) == 0xF0
-	        && (sc->tulip_hwaddr[5] & 2) == 0) {
-	    sc->tulip_boardsw = &tulip_21040_zx314_master_boardsw;
-	    sc->tulip_flags |= TULIP_SHAREDINTR;
-	}
-    } else if (sc->tulip_hwaddr[0] == TULIP_OUI_SMC_0
-	       && sc->tulip_hwaddr[1] == TULIP_OUI_SMC_1
-	       && sc->tulip_hwaddr[2] == TULIP_OUI_SMC_2) {
-	tulip_identify_smc_nic(sc);
-    }
-
-    if (sc->tulip_boardidbuf[0] != '\0')
-	sc->tulip_boardid = sc->tulip_boardidbuf;
-    else
-	sc->tulip_boardid = sc->tulip_boardsw->bd_description;
-    sc->tulip_flags |= TULIP_ROMOK;
-    return 0;
-}
-
-static void
-tulip_addr_filter(
-    tulip_softc_t * const sc)
-{
-    u_int32_t *sp = sc->tulip_setupdata;
-    struct ifmultiaddr *ifma;
-    int i = 0;
-    u_char *addrp;
-    unsigned hash;
-
-    ifma = sc->tulip_if.if_multiaddrs.lh_first;
-
-    sc->tulip_flags &= ~TULIP_WANTHASH;
-    sc->tulip_flags |= TULIP_WANTSETUP;
-    sc->tulip_cmdmode &= ~TULIP_CMD_RXRUN;
-    sc->tulip_intrmask &= ~TULIP_STS_RXSTOPPED;
-
-    for (ifma = sc->tulip_if.if_multiaddrs.lh_first; ifma;
-	 ifma = ifma->ifma_link.le_next) {
-	    if (ifma->ifma_addr->sa_family != AF_LINK)
-		    continue;
-	    if (i > 14)
-		    goto musthash;
-	    addrp = LLADDR((struct sockaddr_dl *)ifma->ifma_addr);
-	    *sp++ = ((u_int16_t *) addrp)[0]; 
-	    *sp++ = ((u_int16_t *) addrp)[1]; 
-	    *sp++ = ((u_int16_t *) addrp)[2];
-	    i++;
-    }
-    /*
-     * Add the broadcast address.
-     */
-    i++;
-    *sp++ = 0xFFFF;
-    *sp++ = 0xFFFF;
-    *sp++ = 0xFFFF;
-    /*
-     * Pad the rest with our hardware address
-     */
-    for (; i < 16; i++) {
-	    *sp++ = ((u_int16_t *) sc->tulip_ac.ac_enaddr)[0]; 
-	    *sp++ = ((u_int16_t *) sc->tulip_ac.ac_enaddr)[1]; 
-	    *sp++ = ((u_int16_t *) sc->tulip_ac.ac_enaddr)[2];
-    }
-    return;
-
-musthash:
-    bzero(sc->tulip_setupdata, sizeof(sc->tulip_setupdata));
-    hash = tulip_mchash(etherbroadcastaddr);
-    sp[hash >> 4] |= 1 << (hash & 0xF);
-    for (ifma = sc->tulip_if.if_multiaddrs.lh_first; ifma;
-	 ifma = ifma->ifma_link.le_next) {
-	    if (ifma->ifma_addr->sa_family != AF_LINK)
-		    continue;
-
-	    hash = tulip_mchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr));
-	    sp[hash >> 4] |= 1 << (hash & 0xF);
-    }
-    sc->tulip_flags |= TULIP_WANTHASH;
-    sp[39] = ((u_int16_t *) sc->tulip_ac.ac_enaddr)[0]; 
-    sp[40] = ((u_int16_t *) sc->tulip_ac.ac_enaddr)[1]; 
-    sp[41] = ((u_int16_t *) sc->tulip_ac.ac_enaddr)[2];
-}
-
-/*
- * This routine is entered at splnet() and thereby imposes no problems
- * when TULIP_USE_SOFTINTR is defined or not.
+ * This routine is entered at splnet() (splsoftnet() on NetBSD)
+ * and thereby imposes no problems when TULIP_USE_SOFTINTR is 
+ * defined or not.
  */
 static int
 tulip_ifioctl(
@@ -3378,54 +3808,126 @@ tulip_ifioctl(
     caddr_t data)
 {
     tulip_softc_t * const sc = TULIP_IFP_TO_SOFTC(ifp);
+    struct ifaddr *ifa = (struct ifaddr *)data;
     struct ifreq *ifr = (struct ifreq *) data;
     tulip_spl_t s;
     int error = 0;
 
 #if defined(TULIP_USE_SOFTINTR)
-    s = splnet();
+    s = TULIP_RAISESOFTSPL();
 #else
-    s = splimp();
+    s = TULIP_RAISESPL();
 #endif
     switch (cmd) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	    ether_ioctl(ifp, cmd, data);
-	    break;
+	case SIOCSIFADDR: {
+	    ifp->if_flags |= IFF_UP;
+	    switch(ifa->ifa_addr->sa_family) {
+#ifdef INET
+		case AF_INET: {
+		    tulip_init(sc);
+		    TULIP_ARP_IFINIT(sc, ifa);
+		    break;
+		}
+#endif /* INET */
 
-	case SIOCSIFFLAGS: {
-	    /*
-	     * Changing the connection forces a reset.
-	     */
-	    if (sc->tulip_flags & TULIP_ALTPHYS) {
-		if ((ifp->if_flags & IFF_ALTPHYS) == 0) {
-		    sc->tulip_flags |= TULIP_NEEDRESET;
+#ifdef NS
+		/*
+		 * This magic copied from if_is.c; I don't use XNS,
+		 * so I have no way of telling if this actually
+		 * works or not.
+		 */
+		case AF_NS: {
+		    struct ns_addr *ina = &(IA_SNS(ifa)->sns_addr);
+		    if (ns_nullhost(*ina)) {
+			ina->x_host = *(union ns_host *)(sc->tulip_enaddr);
+		    } else {
+			ifp->if_flags &= ~IFF_RUNNING;
+			bcopy((caddr_t)ina->x_host.c_host,
+			      (caddr_t)sc->tulip_enaddr,
+			      sizeof(sc->tulip_enaddr));
+		    }
+		    tulip_init(sc);
+		    break;
 		}
-	    } else {
-		if (ifp->if_flags & IFF_ALTPHYS) {
-		    sc->tulip_flags |= TULIP_NEEDRESET;
+#endif /* NS */
+
+		default: {
+		    tulip_init(sc);
+		    break;
 		}
 	    }
-	    if (sc->tulip_flags & TULIP_NEEDRESET) {
+	    break;
+	}
+	case SIOCGIFADDR: {
+	    bcopy((caddr_t) sc->tulip_enaddr,
+		  (caddr_t) ((struct sockaddr *)&ifr->ifr_data)->sa_data,
+		  6);
+	    break;
+	}
+
+	case SIOCSIFFLAGS: {
+#if !defined(IFM_ETHER)
+	    int flags = 0;
+	    if (ifp->if_flags & IFF_LINK0) flags |= 1;
+	    if (ifp->if_flags & IFF_LINK1) flags |= 2;
+	    if (ifp->if_flags & IFF_LINK2) flags |= 4;
+	    if (flags == 7) {
+		ifp->if_flags &= ~(IFF_LINK0|IFF_LINK1|IFF_LINK2);
 		sc->tulip_media = TULIP_MEDIA_UNKNOWN;
 		sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
-		sc->tulip_flags &= ~(TULIP_TXPROBE_ACTIVE|TULIP_TXPROBE_OK|TULIP_WANTRXACT);
+		sc->tulip_flags &= ~(TULIP_WANTRXACT|TULIP_LINKUP|TULIP_NOAUTOSENSE);
 		tulip_reset(sc);
+	    } else if (flags) {
+		tulip_media_t media;
+		for (media = TULIP_MEDIA_UNKNOWN; media < TULIP_MEDIA_MAX; media++) {
+		    if (sc->tulip_mediums[media] != NULL && --flags == 0) {
+			sc->tulip_flags |= TULIP_NOAUTOSENSE;
+			if (sc->tulip_media != media || (sc->tulip_flags & TULIP_DIDNWAY)) {
+			    sc->tulip_flags &= ~TULIP_DIDNWAY;
+			    tulip_linkup(sc, media);
+			}
+			break;
+		    }
+		}
+		if (flags)
+		    printf(TULIP_PRINTF_FMT ": ignored invalid media request\n");
 	    }
+#endif
 	    tulip_init(sc);
 	    break;
 	}
 
+#if defined(SIOCSIFMEDIA)
+	case SIOCSIFMEDIA:
+	case SIOCGIFMEDIA: {
+	    error = ifmedia_ioctl(ifp, ifr, &sc->tulip_ifmedia, cmd);
+	    break;
+	}
+#endif
+
 	case SIOCADDMULTI:
-	case SIOCDELMULTI:
+	case SIOCDELMULTI: {
 	    /*
 	     * Update multicast listeners
 	     */
+#if defined(__FreeBSD__) && __FreeBSD__ >= 3
 	    tulip_addr_filter(sc);		/* reset multicast filtering */
 	    tulip_init(sc);
 	    error = 0;
-	    break;
+#else
+	    if (cmd == SIOCADDMULTI)
+		error = ether_addmulti(ifr, TULIP_ETHERCOM(sc));
+	    else
+		error = ether_delmulti(ifr, TULIP_ETHERCOM(sc));
 
+	    if (error == ENETRESET) {
+		tulip_addr_filter(sc);		/* reset multicast filtering */
+		tulip_init(sc);
+		error = 0;
+	    }
+#endif
+	    break;
+	}
 #if defined(SIOCSIFMTU)
 #if !defined(ifr_mtu)
 #define ifr_mtu ifr_metric
@@ -3452,20 +3954,32 @@ tulip_ifioctl(
 	    break;
 #endif /* SIOCSIFMTU */
 
+#ifdef SIOCGADDRROM
+	case SIOCGADDRROM: {
+	    error = copyout(sc->tulip_rombuf, ifr->ifr_data, sizeof(sc->tulip_rombuf));
+	    break;
+	}
+#endif
+#ifdef SIOCGCHIPID
+	case SIOCGCHIPID: {
+	    ifr->ifr_metric = (int) sc->tulip_chipid;
+	    break;
+	}
+#endif
 	default: {
 	    error = EINVAL;
 	    break;
 	}
     }
 
-    splx(s);
+    TULIP_RESTORESPL(s);
     return error;
 }
 
 /*
- * This routine gets called at splimp (from ether_output).  This might pose
- * a problem for TULIP_USE_SOFTINTR if ether_output is called at splimp
- * from another driver.
+ * This routine gets called at device spl (from ether_output).  This might
+ * pose a problem for TULIP_USE_SOFTINTR if ether_output is called at
+ * device spl from another driver.
  */
 static ifnet_ret_t
 tulip_ifstart(
@@ -3485,7 +3999,15 @@ tulip_ifstart(
 	int segcnt, free, recopy;
 	u_int32_t d_status;
 
-	if (sc->tulip_flags & TULIP_WANTSETUP) {
+	if ((sc->tulip_flags & (TULIP_WANTSETUP|TULIP_TXPROBE_ACTIVE)) == TULIP_WANTSETUP) {
+#if defined(TULIP_DEBUG)
+	    if ((sc->tulip_cmdmode & TULIP_CMD_TXRUN) == 0) {
+		printf(TULIP_PRINTF_FMT ": ifstart: tx not running\n",
+		       TULIP_PRINTF_ARGS);
+		ifp->if_flags |= IFF_OACTIVE;
+		return;
+	    }
+#endif
 	    if ((sc->tulip_flags & TULIP_DOINGSETUP) || ri->ri_free == 1) {
 		ifp->if_flags |= IFF_OACTIVE;
 		return;
@@ -3495,17 +4017,18 @@ tulip_ifstart(
 	    sc->tulip_flags &= ~TULIP_WANTSETUP;
 	    sc->tulip_flags |= TULIP_DOINGSETUP;
 	    ri->ri_free--;
-	    ri->ri_nextout->d_flag &= TULIP_DFLAG_ENDRING|TULIP_DFLAG_CHAIN;
-	    ri->ri_nextout->d_flag |= TULIP_DFLAG_TxFIRSTSEG|TULIP_DFLAG_TxLASTSEG
+	    nextout = ri->ri_nextout;
+	    nextout->d_flag &= TULIP_DFLAG_ENDRING|TULIP_DFLAG_CHAIN;
+	    nextout->d_flag |= TULIP_DFLAG_TxFIRSTSEG|TULIP_DFLAG_TxLASTSEG
 		    |TULIP_DFLAG_TxSETUPPKT|TULIP_DFLAG_TxWANTINTR;
-	    if (sc->tulip_flags & TULIP_WANTHASH)
-		ri->ri_nextout->d_flag |= TULIP_DFLAG_TxHASHFILT;
-	    ri->ri_nextout->d_length1 = sizeof(sc->tulip_setupbuf);
-	    ri->ri_nextout->d_addr1 = TULIP_KVATOPHYS(sc, sc->tulip_setupbuf);
-	    ri->ri_nextout->d_length2 = 0;
-	    ri->ri_nextout->d_addr2 = 0;
-	    ri->ri_nextout->d_status = TULIP_DSTS_OWNER;
-	    TULIP_CSR_WRITE(sc, csr_txpoll, 1);
+	    if (sc->tulip_flags & TULIP_WANTHASHPERFECT)
+		nextout->d_flag |= TULIP_DFLAG_TxHASHFILT;
+	    else if (sc->tulip_flags & TULIP_WANTHASHONLY)
+		nextout->d_flag |= TULIP_DFLAG_TxHASHFILT|TULIP_DFLAG_TxINVRSFILT;
+	    nextout->d_length1 = sizeof(sc->tulip_setupbuf);
+	    nextout->d_addr1 = TULIP_KVATOPHYS(sc, sc->tulip_setupbuf);
+	    nextout->d_length2 = 0;
+	    nextout->d_addr2 = 0;
 	    /*
 	     * Advance the ring for the next transmit packet.
 	     */
@@ -3517,6 +4040,8 @@ tulip_ifstart(
 	     * ring.
 	     */
 	    ri->ri_nextout->d_status = 0;
+	    nextout->d_status = TULIP_DSTS_OWNER;
+	    TULIP_CSR_WRITE(sc, csr_txpoll, 1);
 	}
 
 	IF_DEQUEUE(ifq, m);
@@ -3700,11 +4225,11 @@ tulip_ifstart(
 }
 
 /*
- * Even though this routine runs at splimp, it does not break
+ * Even though this routine runs at device spl, it does not break
  * our use of splnet (splsoftnet under NetBSD) for the majority
  * of this driver (if TULIP_USE_SOFTINTR defined) since 
  * if_watcbog is called from if_watchdog which is called from
- * splsoftclock which is below splnet.
+ * splsoftclock which is below spl[soft]net.
  */
 static void
 tulip_ifwatchdog(
@@ -3717,8 +4242,6 @@ tulip_ifwatchdog(
     if (rxintrs > sc->tulip_dbg.dbg_high_rxintrs_hz)
 	sc->tulip_dbg.dbg_high_rxintrs_hz = rxintrs;
     sc->tulip_dbg.dbg_last_rxintrs = sc->tulip_dbg.dbg_rxintrs;
-    sc->tulip_dbg.dbg_gpintrs_hz = sc->tulip_dbg.dbg_gpintrs;
-    sc->tulip_dbg.dbg_gpintrs = 0;
 #endif /* TULIP_DEBUG */
 
     sc->tulip_if.if_timer = 1;
@@ -3726,16 +4249,7 @@ tulip_ifwatchdog(
      * These should be rare so do a bulk test up front so we can just skip
      * them if needed.
      */
-    if (sc->tulip_flags & (TULIP_SYSTEMERROR|TULIP_RXBUFSLOW|TULIP_FAKEGPTIMEOUT|TULIP_NOMESSAGES)) {
-	/*
-	 * This for those devices that need to autosense.  Interrupts are not
-	 * allowed during device probe so we fake one here to start the
-	 * autosense.  Do this before the others since it can effect their
-	 * state.
-	 */
-	if (sc->tulip_flags & TULIP_FAKEGPTIMEOUT)
-	    (*sc->tulip_boardsw->bd_media_select)(sc);
-
+    if (sc->tulip_flags & (TULIP_SYSTEMERROR|TULIP_RXBUFSLOW|TULIP_NOMESSAGES)) {
 	/*
 	 * If the number of receive buffer is low, try to refill
 	 */
@@ -3757,9 +4271,11 @@ tulip_ifwatchdog(
 
     if (sc->tulip_txtimer && --sc->tulip_txtimer == 0) {
 	printf(TULIP_PRINTF_FMT ": transmission timeout\n", TULIP_PRINTF_ARGS);
-	sc->tulip_media = TULIP_MEDIA_UNKNOWN;
-	sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
-	sc->tulip_flags &= ~(TULIP_TXPROBE_ACTIVE|TULIP_TXPROBE_OK|TULIP_WANTRXACT|TULIP_LINKUP|TULIP_LINKSUSPECT);
+	if (TULIP_DO_AUTOSENSE(sc)) {
+	    sc->tulip_media = TULIP_MEDIA_UNKNOWN;
+	    sc->tulip_probe_state = TULIP_PROBE_INACTIVE;
+	    sc->tulip_flags &= ~(TULIP_WANTRXACT|TULIP_LINKUP);
+	}
 	tulip_reset(sc);
 	tulip_init(sc);
     }
@@ -3794,7 +4310,6 @@ tulip_attach(
     ifp->if_ioctl = tulip_ifioctl;
     ifp->if_start = tulip_ifstart;
     ifp->if_watchdog = tulip_ifwatchdog;
-    ifp->if_init = (if_init_f_t*)tulip_init;
     ifp->if_timer = 1;
 #if !defined(__bsdi__) || _BSDI_VERSION < 199401
     ifp->if_output = ether_output;
@@ -3813,7 +4328,7 @@ tulip_attach(
     sc->tulip_pf = aprint_normal;
     aprint_normal(TULIP_PRINTF_FMT ": address " TULIP_EADDR_FMT "\n",
 		  TULIP_PRINTF_ARGS,
-		  TULIP_EADDR_ARGS(sc->tulip_hwaddr));
+		  TULIP_EADDR_ARGS(sc->tulip_enaddr));
 #else
     printf(
 #if defined(__bsdi__)
@@ -3827,36 +4342,56 @@ tulip_attach(
 	   sc->tulip_revinfo & 0x0F);
     printf(TULIP_PRINTF_FMT ": address " TULIP_EADDR_FMT "\n",
 	   TULIP_PRINTF_ARGS,
-	   TULIP_EADDR_ARGS(sc->tulip_hwaddr));
+	   TULIP_EADDR_ARGS(sc->tulip_enaddr));
 #endif
 
-    sc->tulip_dot3stats.dot3Compliance = DOT3COMPLIANCE_STATS;
-    sc->tulip_dot3stats.dot3StatsEtherChipSet = 
-	    tulip_chip2mib[sc->tulip_chipid];
-
-    if (sc->tulip_boardsw->bd_mii_probe != NULL)
-	(*sc->tulip_boardsw->bd_mii_probe)(sc);
+#if defined(__alpha__)
+    /*
+     * In case the SRM console told us about a bogus media,
+     * we need to check to be safe.
+     */
+    if (sc->tulip_mediums[sc->tulip_media] == NULL)
+	sc->tulip_media = TULIP_MEDIA_UNKNOWN;
+#endif
 
-    if ((*sc->tulip_boardsw->bd_media_probe)(sc)) {
-	ifp->if_flags |= IFF_ALTPHYS;
-    } else {
-	sc->tulip_flags |= TULIP_ALTPHYS;
+    (*sc->tulip_boardsw->bd_media_probe)(sc);
+#if defined(IFM_ETHER)
+    ifmedia_init(&sc->tulip_ifmedia, 0,
+		 tulip_ifmedia_change,
+		 tulip_ifmedia_status);
+#else
+    {
+	tulip_media_t media;
+	int cnt;
+	printf(TULIP_PRINTF_FMT ": media:", TULIP_PRINTF_ARGS);
+	for (media = TULIP_MEDIA_UNKNOWN, cnt = 1; cnt < 7 && media < TULIP_MEDIA_MAX; media++) {
+	    if (sc->tulip_mediums[media] != NULL) {
+		printf(" %d=\"%s\"", cnt, tulip_mediums[media]);
+		cnt++;
+	    }
+	}
+	if (cnt == 1) {
+	    sc->tulip_features |= TULIP_HAVE_NOMEDIA;
+	    printf(" none\n");
+	} else {
+	    printf("\n");
+	}
     }
-
-    sc->tulip_flags |= TULIP_DEVICEPROBE;
-    tulip_reset(sc);
+#endif
     sc->tulip_flags &= ~TULIP_DEVICEPROBE;
+#if defined(IFM_ETHER)
+    tulip_ifmedia_add(sc);
+#endif
 
-    ifp->if_linkmib = &sc->tulip_dot3stats;
-    ifp->if_linkmiblen = sizeof sc->tulip_dot3stats;
+    tulip_reset(sc);
 
 #if defined(__bsdi__) && _BSDI_VERSION >= 199510
     sc->tulip_pf = printf;
-    ether_attach(ifp);
+    TULIP_ETHER_IFATTACH(sc);
 #else
     if_attach(ifp);
 #if defined(__NetBSD__) || (defined(__FreeBSD__) && BSD >= 199506)
-    ether_ifattach(ifp);
+    TULIP_ETHER_IFATTACH(sc);
 #endif
 #endif /* __bsdi__ */
 
@@ -3880,38 +4415,16 @@ tulip_initcsrs(
     sc->tulip_csrs.csr_command		= csr_base +  6 * csr_size;
     sc->tulip_csrs.csr_intr		= csr_base +  7 * csr_size;
     sc->tulip_csrs.csr_missed_frames	= csr_base +  8 * csr_size;
-    if (sc->tulip_chipid == TULIP_21040) {
-	sc->tulip_csrs.csr_enetrom		= csr_base +  9 * csr_size;
-	sc->tulip_csrs.csr_reserved		= csr_base + 10 * csr_size;
-	sc->tulip_csrs.csr_full_duplex		= csr_base + 11 * csr_size;
-	sc->tulip_csrs.csr_sia_status		= csr_base + 12 * csr_size;
-	sc->tulip_csrs.csr_sia_connectivity	= csr_base + 13 * csr_size;
-	sc->tulip_csrs.csr_sia_tx_rx 		= csr_base + 14 * csr_size;
-	sc->tulip_csrs.csr_sia_general		= csr_base + 15 * csr_size;
+    sc->tulip_csrs.csr_9		= csr_base +  9 * csr_size;
+    sc->tulip_csrs.csr_10		= csr_base + 10 * csr_size;
+    sc->tulip_csrs.csr_11		= csr_base + 11 * csr_size;
+    sc->tulip_csrs.csr_12		= csr_base + 12 * csr_size;
+    sc->tulip_csrs.csr_13		= csr_base + 13 * csr_size;
+    sc->tulip_csrs.csr_14		= csr_base + 14 * csr_size;
+    sc->tulip_csrs.csr_15		= csr_base + 15 * csr_size;
 #if defined(TULIP_EISA)
-    } else if (sc->tulip_chipid == TULIP_DE425) {
-	sc->tulip_csrs.csr_enetrom		= csr_base + DE425_ENETROM_OFFSET;
-	sc->tulip_csrs.csr_reserved		= csr_base + 10 * csr_size;
-	sc->tulip_csrs.csr_full_duplex		= csr_base + 11 * csr_size;
-	sc->tulip_csrs.csr_sia_status		= csr_base + 12 * csr_size;
-	sc->tulip_csrs.csr_sia_connectivity	= csr_base + 13 * csr_size;
-	sc->tulip_csrs.csr_sia_tx_rx 		= csr_base + 14 * csr_size;
-	sc->tulip_csrs.csr_sia_general		= csr_base + 15 * csr_size;
-#endif /* TULIP_EISA */
-    } else if (sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) {
-	sc->tulip_csrs.csr_srom_mii		= csr_base +  9 * csr_size;
-	sc->tulip_csrs.csr_gp_timer		= csr_base + 11 * csr_size;
-	sc->tulip_csrs.csr_gp			= csr_base + 12 * csr_size;
-	sc->tulip_csrs.csr_watchdog		= csr_base + 15 * csr_size;
-    } else if (sc->tulip_chipid == TULIP_21041) {
-	sc->tulip_csrs.csr_srom_mii		= csr_base +  9 * csr_size;
-	sc->tulip_csrs.csr_bootrom		= csr_base + 10 * csr_size;
-	sc->tulip_csrs.csr_gp_timer		= csr_base + 11 * csr_size;
-	sc->tulip_csrs.csr_sia_status		= csr_base + 12 * csr_size;
-	sc->tulip_csrs.csr_sia_connectivity	= csr_base + 13 * csr_size;
-	sc->tulip_csrs.csr_sia_tx_rx 		= csr_base + 14 * csr_size;
-	sc->tulip_csrs.csr_sia_general		= csr_base + 15 * csr_size;
-    }
+    sc->tulip_csrs.csr_enetrom		= csr_base + DE425_ENETROM_OFFSET;
+#endif
 }
 
 static void
@@ -3950,17 +4463,25 @@ static const int tulip_eisa_irqs[4] = { IRQ5, IRQ9, IRQ10, IRQ11 };
 #if defined(__FreeBSD__)
 
 #define	TULIP_PCI_ATTACH_ARGS	pcici_t config_id, int unit
+#define	TULIP_SHUTDOWN_ARGS	int howto, void * arg
 
-static void
-tulip_shutdown(
-    int howto,
-    void *sc)
+#if defined(TULIP_DEVCONF)
+static void tulip_shutdown(TULIP_SHUTDOWN_ARGS);
+
+static int
+tulip_pci_shutdown(
+    struct kern_devconf * const kdc,
+    int force)
 {
-    TULIP_CSR_WRITE((tulip_softc_t *) sc, csr_busmode, TULIP_BUSMODE_SWRESET);
-    DELAY(10);	/* Wait 10 microseconds (actually 50 PCI cycles but at 
-		   33MHz that comes to two microseconds but wait a
-		   bit longer anyways) */
+    if (kdc->kdc_unit < TULIP_MAX_DEVICES) {
+	tulip_softc_t * const sc = TULIP_UNIT_TO_SOFTC(kdc->kdc_unit);
+	if (sc != NULL)
+	    tulip_shutdown(0, sc);
+    }
+    (void) dev_detach(kdc);
+    return 0;
 }
+#endif
 
 static char*
 tulip_pci_probe(
@@ -3979,7 +4500,13 @@ tulip_pci_probe(
 	    return "Digital 21140A Fast Ethernet";
 	else
 	    return "Digital 21140 Fast Ethernet";
-
+    }
+    if (PCI_CHIPID(device_id) == CHIPID_21142) {
+	u_int32_t revinfo = pci_conf_read(config_id, PCI_CFRV) & 0xFF;
+	if (revinfo >= 0x20)
+	    return "Digital 21143 Fast Ethernet";
+	else
+	    return "Digital 21142 Fast Ethernet";
     }
     return NULL;
 }
@@ -3992,7 +4519,9 @@ struct pci_device dedevice = {
     tulip_pci_probe,
     tulip_pci_attach,
    &tulip_pci_count,
-    NULL
+#if defined(TULIP_DEVCONF)
+    tulip_pci_shutdown,
+#endif
 };
 
 DATA_SET (pcidevice_set, dedevice);
@@ -4000,17 +4529,7 @@ DATA_SET (pcidevice_set, dedevice);
 
 #if defined(__bsdi__)
 #define	TULIP_PCI_ATTACH_ARGS	struct device * const parent, struct device * const self, void * const aux
-
-static void
-tulip_shutdown(
-    void *arg)
-{
-    tulip_softc_t * const sc = (tulip_softc_t *) arg;
-    TULIP_CSR_WRITE(sc, csr_busmode, TULIP_BUSMODE_SWRESET);
-    DELAY(10);	/* Wait 10 microseconds (actually 50 PCI cycles but at 
-			   33MHz that comes to two microseconds but wait a
-			   bit longer anyways) */
-}
+#define	TULIP_SHUTDOWN_ARGS	void *arg
 
 static int
 tulip_pci_match(
@@ -4023,7 +4542,8 @@ tulip_pci_match(
     if (PCI_VENDORID(id) != DEC_VENDORID)
 	return 0;
     id = PCI_CHIPID(id);
-    if (id != CHIPID_21040 && id != CHIPID_21041 && id != CHIPID_21140)
+    if (id != CHIPID_21040 && id != CHIPID_21041
+	    && id != CHIPID_21140 && id != CHIPID_21142)
 	return 0;
     irq = pci_inl(pa, PCI_I_LINE) & 0xFF;
     if (irq == 0 || irq >= 16) {
@@ -4154,22 +4674,15 @@ struct cfdriver decd = {
 
 #if defined(__NetBSD__)
 #define	TULIP_PCI_ATTACH_ARGS	struct device * const parent, struct device * const self, void * const aux
-
-static void
-tulip_pci_shutdown(
-    void *arg)
-{
-    tulip_softc_t * const sc = (tulip_softc_t *) arg;
-    TULIP_CSR_WRITE(sc, csr_busmode, TULIP_BUSMODE_SWRESET);
-    DELAY(10);	/* Wait 10 microseconds (actually 50 PCI cycles but at 
-			   33MHz that comes to two microseconds but wait a
-			   bit longer anyways) */
-}
-
+#define	TULIP_SHUTDOWN_ARGS	void *arg
 static int
 tulip_pci_probe(
     struct device *parent,
+#ifdef __BROKEN_INDIRECT_CONFIG
     void *match,
+#else
+    struct cfdata *match,
+#endif
     void *aux)
 {
     struct pci_attach_args *pa = (struct pci_attach_args *) aux;
@@ -4178,7 +4691,8 @@ tulip_pci_probe(
 	return 0;
     if (PCI_CHIPID(pa->pa_id) == CHIPID_21040
 	    || PCI_CHIPID(pa->pa_id) == CHIPID_21041
-	    || PCI_CHIPID(pa->pa_id) == CHIPID_21140)
+	    || PCI_CHIPID(pa->pa_id) == CHIPID_21140
+	    || PCI_CHIPID(pa->pa_id) == CHIPID_21142)
 	return 1;
 
     return 0;
@@ -4197,6 +4711,17 @@ struct cfdriver de_cd = {
 #endif /* __NetBSD__ */
 
 static void
+tulip_shutdown(
+    TULIP_SHUTDOWN_ARGS)
+{
+    tulip_softc_t * const sc = arg;
+    TULIP_CSR_WRITE(sc, csr_busmode, TULIP_BUSMODE_SWRESET);
+    DELAY(10);	/* Wait 10 microseconds (actually 50 PCI cycles but at 
+		   33MHz that comes to two microseconds but wait a
+		   bit longer anyways) */
+}
+
+static void
 tulip_pci_attach(
     TULIP_PCI_ATTACH_ARGS)
 {
@@ -4204,6 +4729,13 @@ tulip_pci_attach(
     tulip_softc_t *sc;
 #define	PCI_CONF_WRITE(r, v)	pci_conf_write(config_id, (r), (v))
 #define	PCI_CONF_READ(r)	pci_conf_read(config_id, (r))
+#if __FreeBSD__ >= 3
+#define	PCI_GETBUSDEVINFO(sc)	((void)((sc)->tulip_pci_busno = (config_id->bus), /* XXX */ \
+					(sc)->tulip_pci_devno = (config_id->slot))) /* XXX */
+#else
+#define	PCI_GETBUSDEVINFO(sc)	((void)((sc)->tulip_pci_busno = ((config_id.cfg1 >> 16) & 0xFF), /* XXX */ \
+					(sc)->tulip_pci_devno = ((config_id.cfg1 >> 11) & 0x1F))) /* XXX */
+#endif
 #endif
 #if defined(__bsdi__)
     tulip_softc_t * const sc = (tulip_softc_t *) self;
@@ -4212,20 +4744,21 @@ tulip_pci_attach(
     const int unit = sc->tulip_dev.dv_unit;
 #define	PCI_CONF_WRITE(r, v)	pci_outl(pa, (r), (v))
 #define	PCI_CONF_READ(r)	pci_inl(pa, (r))
+#define	PCI_GETBUSDEVINFO(sc)	((void)((sc)->tulip_pci_busno = pa->d_bus, \
+					(sc)->tulip_pci_devno = pa->d_agent))
 #endif
 #if defined(__NetBSD__)
     tulip_softc_t * const sc = (tulip_softc_t *) self;
     struct pci_attach_args * const pa = (struct pci_attach_args *) aux;
     const int unit = sc->tulip_dev.dv_unit;
-#if defined(TULIP_IOMAPPED)
-    bus_io_addr_t iobase;
-    bus_io_size_t iosize;
-#else
-    bus_mem_addr_t membase;
-    bus_mem_size_t memsize;
-#endif
 #define	PCI_CONF_WRITE(r, v)	pci_conf_write(pa->pa_pc, pa->pa_tag, (r), (v))
 #define	PCI_CONF_READ(r)	pci_conf_read(pa->pa_pc, pa->pa_tag, (r))
+#define	PCI_GETBUSDEVINFO(sc)	do { \
+	int busno, devno, funcno; \
+	pci_decompose_tag(pa->pa_pc, pa->pa_tag, &busno, &devno, &funcno); \
+	(sc)->tulip_pci_busno = busno; \
+	(sc)->tulip_pci_devno = devno; \
+    } while (0)
 #endif /* __NetBSD__ */
     int retval, idx;
     u_int32_t revinfo, cfdainfo, id;
@@ -4258,20 +4791,23 @@ tulip_pci_attach(
 	csrsize = TULIP_EISA_CSRSIZE;
 	chipid = TULIP_DE425;
 	cfdainfo = 0;
-#endif
+#endif /* TULIP_EISA */
     }
 #else /* __bsdi__ */
     revinfo  = PCI_CONF_READ(PCI_CFRV) & 0xFF;
     id       = PCI_CONF_READ(PCI_CFID);
     cfdainfo = PCI_CONF_READ(PCI_CFDA);
-#endif
+#endif /* __bsdi__ */
 
     if (PCI_VENDORID(id) == DEC_VENDORID) {
 	if (PCI_CHIPID(id) == CHIPID_21040) chipid = TULIP_21040;
 	else if (PCI_CHIPID(id) == CHIPID_21140) {
 	    chipid = (revinfo >= 0x20) ? TULIP_21140A : TULIP_21140;
+	} else if (PCI_CHIPID(id) == CHIPID_21142) {
+	    chipid = (revinfo >= 0x20) ? TULIP_21143 : TULIP_21142;
 	}
 	else if (PCI_CHIPID(id) == CHIPID_21041) chipid = TULIP_21041;
+	else if (PCI_CHIPID(id) == CHIPID_21142) chipid = TULIP_21142;
     }
     if (chipid == TULIP_CHIPID_UNKNOWN)
 	return;
@@ -4292,15 +4828,6 @@ tulip_pci_attach(
 	return;
     }
 
-    if ((chipid == TULIP_21041 || chipid == TULIP_21140A)
-	&& (cfdainfo & (TULIP_CFDA_SLEEP|TULIP_CFDA_SNOOZE))) {
-	cfdainfo &= ~(TULIP_CFDA_SLEEP|TULIP_CFDA_SNOOZE);
-	PCI_CONF_WRITE(PCI_CFDA, cfdainfo);
-	printf("de%d: waking device from sleep/snooze mode\n", unit);
-	DELAY(11*1000);
-    }
-
-
 #if defined(__FreeBSD__)
     sc = (tulip_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT);
     if (sc == NULL)
@@ -4308,11 +4835,51 @@ tulip_pci_attach(
     bzero(sc, sizeof(*sc));				/* Zero out the softc*/
 #endif
 
+    PCI_GETBUSDEVINFO(sc);
     sc->tulip_chipid = chipid;
+    sc->tulip_flags |= TULIP_DEVICEPROBE;
+    if (chipid == TULIP_21140 || chipid == TULIP_21140A)
+	sc->tulip_features |= TULIP_HAVE_GPR;
+    if (chipid == TULIP_21140A && revinfo <= 0x22)
+	sc->tulip_features |= TULIP_HAVE_RXBADOVRFLW;
+    if (chipid == TULIP_21140)
+	sc->tulip_features |= TULIP_HAVE_BROKEN_HASH;
+    if (chipid != TULIP_21040 && chipid != TULIP_DE425 && chipid != TULIP_21140)
+	sc->tulip_features |= TULIP_HAVE_POWERMGMT;
+    if (chipid == TULIP_21041 || chipid == TULIP_21142 || chipid == TULIP_21143) {
+	sc->tulip_features |= TULIP_HAVE_DUALSENSE;
+	if (chipid != TULIP_21041 || sc->tulip_revinfo >= 0x20)
+	    sc->tulip_features |= TULIP_HAVE_SIANWAY;
+	if (chipid != TULIP_21041)
+	    sc->tulip_features |= TULIP_HAVE_SIAGP|TULIP_HAVE_RXBADOVRFLW;
+    }
+
+    if (sc->tulip_features & TULIP_HAVE_POWERMGMT
+	    && (cfdainfo & (TULIP_CFDA_SLEEP|TULIP_CFDA_SNOOZE))) {
+	cfdainfo &= ~(TULIP_CFDA_SLEEP|TULIP_CFDA_SNOOZE);
+	PCI_CONF_WRITE(PCI_CFDA, cfdainfo);
+	DELAY(11*1000);
+    }
+#if defined(__alpha__)
+    /*
+     * The Alpha SRM console encodes a console set media in the driver
+     * part of the CFDA register.  Note that the Multia presents a
+     * problem in that its BNC mode is really EXTSIA.  So in that case
+     * force a probe.
+     */
+    switch ((cfdainfo >> 8) & 0xff) {
+    case 1: sc->tulip_media = chipid > TULIP_DE425 ? TULIP_MEDIA_AUI : TULIP_MEDIA_AUIBNC;
+    case 2: sc->tulip_media = chipid > TULIP_DE425 ? TULIP_MEDIA_BNC : TULIP_MEDIA_UNKNOWN;
+    case 3: sc->tulip_media = TULIP_MEDIA_10BASET;
+    case 4: sc->tulip_media = TULIP_MEDIA_10BASET_FD;
+    case 5: sc->tulip_media = TULIP_MEDIA_100BASETX;
+    case 6: sc->tulip_media = TULIP_MEDIA_100BASETX_FD;
+    }
+#endif
+
 #if defined(__NetBSD__)
     bcopy(self->dv_xname, sc->tulip_if.if_xname, IFNAMSIZ);
     sc->tulip_if.if_softc = sc;
-    sc->tulip_bc = pa->pa_bc;
     sc->tulip_pc = pa->pa_pc;
 #else
     sc->tulip_unit = unit;
@@ -4336,6 +4903,7 @@ tulip_pci_attach(
 #endif /* __FreeBSD__ */
 
 #if defined(__bsdi__)
+    sc->tulip_pf = printf;
 #if defined(TULIP_IOMAPPED)
     csr_base = ia->ia_iobase;
 #else
@@ -4345,15 +4913,15 @@ tulip_pci_attach(
 
 #if defined(__NetBSD__)
     csr_base = 0;
-#if defined(TULIP_IOMAPPED)
-    if (pci_io_find(pa->pa_pc, pa->pa_tag, PCI_CBIO, &iobase, &iosize)
-	|| bus_io_map(pa->pa_bc, iobase, iosize, &sc->tulip_ioh))
-	return;
-#else
-    if (pci_mem_find(pa->pa_pc, pa->pa_tag, PCI_CBMA, &membase, &memsize, NULL)
-	|| bus_mem_map(pa->pa_bc, membase, memsize, 0, &sc->tulip_memh))
-	return;
-#endif
+    if (pci_mapreg_map(pa, PCI_CBIO, PCI_MAPREG_TYPE_IO, 0,
+		       &sc->tulip_bustag, &sc->tulip_bushandle, NULL, NULL)
+	&& pci_mapreg_map(pa, PCI_CBMA,
+			  PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0,
+			  &sc->tulip_bustag, &sc->tulip_bushandle,
+			  NULL, NULL) == 0) {
+        printf(": unable to map device registers\n");
+        return;
+    }
 #endif /* __NetBSD__ */
 
     tulip_initcsrs(sc, csr_base + csroffset, csrsize);
@@ -4369,7 +4937,7 @@ tulip_pci_attach(
 		   bit longer anyways) */
 
     if ((retval = tulip_read_macaddr(sc)) < 0) {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__)
 	printf(TULIP_PRINTF_FMT, TULIP_PRINTF_ARGS);
 #endif
 	printf(": can't read ENET ROM (why=%d) (", retval);
@@ -4378,19 +4946,18 @@ tulip_pci_attach(
 	printf("\n");
 	printf(TULIP_PRINTF_FMT ": %s%s pass %d.%d\n",
 	       TULIP_PRINTF_ARGS,
-	       (sc->tulip_boardid != NULL ? sc->tulip_boardid : ""),
-	       tulip_chipdescs[sc->tulip_chipid],
+	       sc->tulip_boardid, tulip_chipdescs[sc->tulip_chipid],
 	       (sc->tulip_revinfo & 0xF0) >> 4, sc->tulip_revinfo & 0x0F);
 	printf(TULIP_PRINTF_FMT ": address unknown\n", TULIP_PRINTF_ARGS);
     } else {
-	int s;
+	tulip_spl_t s;
 	tulip_intrfunc_t (*intr_rtn)(void *) = tulip_intr_normal;
 
-	if (sc->tulip_flags & TULIP_SHAREDINTR)
+	if (sc->tulip_features & TULIP_HAVE_SHAREDINTR)
 	    intr_rtn = tulip_intr_shared;
 
 #if defined(__NetBSD__)
-	if ((sc->tulip_flags & TULIP_SLAVEDINTR) == 0) {
+	if ((sc->tulip_features & TULIP_HAVE_SLAVEDINTR) == 0) {
 	    pci_intr_handle_t intrhandle;
 	    const char *intrstr;
 
@@ -4410,23 +4977,25 @@ tulip_pci_attach(
 	    if (sc->tulip_ih == NULL)
 		return;
 	}
-	sc->tulip_ats = shutdownhook_establish(tulip_pci_shutdown, sc);
+	sc->tulip_ats = shutdownhook_establish(tulip_shutdown, sc);
 	if (sc->tulip_ats == NULL)
 	    printf("\n%s: warning: couldn't establish shutdown hook\n",
 		   sc->tulip_xname);
 #endif
 #if defined(__FreeBSD__)
-	if ((sc->tulip_flags & TULIP_SLAVEDINTR) == 0) {
+	if ((sc->tulip_features & TULIP_HAVE_SLAVEDINTR) == 0) {
 	    if (!pci_map_int (config_id, intr_rtn, (void*) sc, &net_imask)) {
 		printf(TULIP_PRINTF_FMT ": couldn't map interrupt\n",
 		       TULIP_PRINTF_ARGS);
 		return;
 	    }
 	}
+#if !defined(TULIP_DEVCONF)
 	at_shutdown(tulip_shutdown, sc, SHUTDOWN_POST_SYNC);
 #endif
+#endif
 #if defined(__bsdi__)
-	if ((sc->tulip_flags & TULIP_SLAVEDINTR) == 0) {
+	if ((sc->tulip_features & TULIP_HAVE_SLAVEDINTR) == 0) {
 	    isa_establish(&sc->tulip_id, &sc->tulip_dev);
 
 	    sc->tulip_ih.ih_fun = intr_rtn;
@@ -4442,20 +5011,10 @@ tulip_pci_attach(
 	if (sc->tulip_unit > tulip_softintr_max_unit)
 	    tulip_softintr_max_unit = sc->tulip_unit;
 #endif
-#if defined(TULIP_DEBUG)
-	if (sc->tulip_chipid == TULIP_21041) {
-	    TULIP_CSR_WRITE(sc, csr_sia_connectivity, TULIP_SIACONN_RESET);
-	    DELAY(1000);
-	    PCI_CONF_WRITE(PCI_CFDA, TULIP_CFDA_SLEEP);
-	    DELAY(20000);
-	    PCI_CONF_WRITE(PCI_CFDA, 0);
-	    DELAY(20000);
-	}
-#endif
 
-	s = splimp();
+	s = TULIP_RAISESPL();
 	tulip_reset(sc);
 	tulip_attach(sc);
-	splx(s);
+	TULIP_RESTORESPL(s);
     }
 }