Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the has-mii-doesn't-have-mii OPMODE block from tlp_init(), and 

let the pre-init hook and media switch routines handle it all.
This commit is contained in:
thorpej 1999-09-20 19:52:31 +00:00
parent 28b026bee1
commit 5ada26d247
1 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sys/dev/ic/tulip.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tulip.c,v 1.14 1999/09/20 19:34:08 thorpej Exp $ */
/* $NetBSD: tulip.c,v 1.15 1999/09/20 19:52:31 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@ -1379,37 +1379,6 @@ tlp_init(sc)
sc->sc_opmode |= OPMODE_SR | OPMODE_ST |
sc->sc_txth[sc->sc_txthresh].txth_opmode;
if (sc->sc_flags & TULIPF_HAS_MII) {
switch (sc->sc_chip) {
case TULIP_CHIP_82C168:
case TULIP_CHIP_82C169:
/* Enable the MII port. */
sc->sc_opmode |= OPMODE_PS;
TULIP_WRITE(sc, CSR_PNIC_ENDEC, PNIC_ENDEC_JDIS);
break;
case TULIP_CHIP_WB89C840F:
/* Nothing. */
break;
default:
/* Enable the MII port. */
sc->sc_opmode |= OPMODE_PS;
break;
}
} else {
switch (sc->sc_chip) {
case TULIP_CHIP_82C168:
case TULIP_CHIP_82C169:
sc->sc_opmode |= OPMODE_PNIC_TBEN;
break;
default:
/* Nothing. */
}
}
/*
* Magical mystery initialization on the Macronix chips.
* The MX98713 uses its own magic value, the rest share
@ -2797,6 +2766,12 @@ tlp_pnic_preinit(sc)
}
TULIP_WRITE(sc, CSR_OPMODE, sc->sc_opmode);
/*
* If not using MII, enable the Tx backoff counter.
*/
if ((sc->sc_flags & TULIPF_HAS_MII) == 0)
sc->sc_opmode |= OPMODE_PNIC_TBEN;
}
/*****************************************************************************
@ -3377,8 +3352,14 @@ tlp_pnic_tmsw_set(sc)
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
struct mii_data *mii = &sc->sc_mii;
if (sc->sc_flags & TULIPF_HAS_MII)
if (sc->sc_flags & TULIPF_HAS_MII) {
/*
* Make sure the built-in Tx jabber timer is disabled.
*/
TULIP_WRITE(sc, CSR_PNIC_ENDEC, PNIC_ENDEC_JDIS);
return (tlp_mii_setmedia(sc));
}
if (ifp->if_flags & IFF_UP) {
mii->mii_media_status = 0;