Current-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
netbsd-6 is broken now
A lot of cases in sys/dev/mii/bgephy.c need to have BGE_PHY_* changed to
BGEPHYF_*.
--
Hisashi T Fujinaka - htodd%twofifty.com@localhost
BSEE(6/86) + BSChem(3/95) + BAEnglish(8/95) + MSCS(8/03) + $2.50 = latte
Index: mii/brgphy.c
===================================================================
RCS file: /cvsroot/src/sys/dev/mii/brgphy.c,v
retrieving revision 1.59.8.3
diff -u -r1.59.8.3 brgphy.c
--- mii/brgphy.c 17 Nov 2013 18:24:05 -0000 1.59.8.3
+++ mii/brgphy.c 17 Nov 2013 22:49:57 -0000
@@ -710,19 +710,19 @@
if (bsc->sc_isbge) {
if (!(sc->mii_flags & MIIF_HAVEFIBER)) {
- if (bsc->sc_phyflags & BGE_PHY_ADC_BUG)
+ if (bsc->sc_phyflags & BGEPHYF_ADC_BUG)
brgphy_adc_bug(sc);
- if (bsc->sc_phyflags & BGE_PHY_5704_A0_BUG)
+ if (bsc->sc_phyflags & BGEPHYF_5704_A0_BUG)
brgphy_5704_a0_bug(sc);
- if (bsc->sc_phyflags & BGE_PHY_BER_BUG)
+ if (bsc->sc_phyflags & BGEPHYF_BER_BUG)
brgphy_ber_bug(sc);
- else if (bsc->sc_phyflags & BGE_PHY_JITTER_BUG) {
+ else if (bsc->sc_phyflags & BGEPHYF_JITTER_BUG) {
PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x0c00);
PHY_WRITE(sc, BRGPHY_MII_DSP_ADDR_REG,
0x000a);
if (bsc->sc_phyflags
- & BGE_PHY_ADJUST_TRIM) {
+ & BGEPHYF_ADJUST_TRIM) {
PHY_WRITE(sc, BRGPHY_MII_DSP_RW_PORT,
0x110b);
PHY_WRITE(sc, BRGPHY_TEST1,
@@ -747,12 +747,12 @@
PHY_WRITE(sc, BRGPHY_MII_EPHY_PTEST, 0x12);
/* Enable Ethernet@Wirespeed */
- if (!(bsc->sc_phyflags & BGE_PHY_NO_WIRESPEED))
+ if (!(bsc->sc_phyflags & BGEPHYF_NO_WIRESPEED))
brgphy_eth_wirespeed(sc);
#if 0
/* Enable Link LED on Dell boxes */
- if (bsc->sc_phyflags & BGE_PHY_NO_3LED) {
+ if (bsc->sc_phyflags & BGEPHYF_NO_3LED) {
PHY_WRITE(sc, BRGPHY_MII_PHY_EXTCTL,
PHY_READ(sc, BRGPHY_MII_PHY_EXTCTL)
& ~BRGPHY_PHY_EXTCTL_3_LED);
Home |
Main Index |
Thread Index |
Old Index