diff options
| author | jkim <jkim@FreeBSD.org> | 2007-02-12 23:33:05 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2007-02-12 23:33:05 +0000 |
| commit | c0b996086f6d99df9476393ae809acab6994d3b0 (patch) | |
| tree | e943ac6c5d78835f2da3b0d671f294e3dc14550b /sys/dev/mii/brgphy.c | |
| parent | e176cc33f53a2dee7896aec59f970825b57845b8 (diff) | |
| download | FreeBSD-src-c0b996086f6d99df9476393ae809acab6994d3b0.zip FreeBSD-src-c0b996086f6d99df9476393ae809acab6994d3b0.tar.gz | |
Fix style(9).
Pointed out by: many
Diffstat (limited to 'sys/dev/mii/brgphy.c')
| -rw-r--r-- | sys/dev/mii/brgphy.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c index 1fa70d7..37f40b1 100644 --- a/sys/dev/mii/brgphy.c +++ b/sys/dev/mii/brgphy.c @@ -99,8 +99,8 @@ static void brgphy_reset(struct mii_softc *); static void brgphy_loop(struct mii_softc *); static void bcm5401_load_dspcode(struct mii_softc *); static void bcm5411_load_dspcode(struct mii_softc *); -static void brgphy_fixup_adc_bug(struct mii_softc *); static void brgphy_fixup_5704_a0_bug(struct mii_softc *); +static void brgphy_fixup_adc_bug(struct mii_softc *); static void brgphy_fixup_adjust_trim(struct mii_softc *); static void brgphy_fixup_ber_bug(struct mii_softc *); static void brgphy_fixup_jitter_bug(struct mii_softc *); @@ -534,15 +534,14 @@ bcm5411_load_dspcode(struct mii_softc *sc) } static void -brgphy_fixup_adc_bug(struct mii_softc *sc) +brgphy_fixup_5704_a0_bug(struct mii_softc *sc) { static const struct { int reg; uint16_t val; } dspcode[] = { - { BRGPHY_MII_AUXCTL, 0x0c00 }, - { BRGPHY_MII_DSP_ADDR_REG, 0x201f }, - { BRGPHY_MII_DSP_RW_PORT, 0x2aaa }, + { 0x1c, 0x8d68 }, + { 0x1c, 0x8d68 }, { 0, 0 }, }; int i; @@ -552,14 +551,15 @@ brgphy_fixup_adc_bug(struct mii_softc *sc) } static void -brgphy_fixup_5704_a0_bug(struct mii_softc *sc) +brgphy_fixup_adc_bug(struct mii_softc *sc) { static const struct { int reg; - u_int16_t val; + uint16_t val; } dspcode[] = { - { 0x1c, 0x8d68 }, - { 0x1c, 0x8d68 }, + { BRGPHY_MII_AUXCTL, 0x0c00 }, + { BRGPHY_MII_DSP_ADDR_REG, 0x201f }, + { BRGPHY_MII_DSP_RW_PORT, 0x2aaa }, { 0, 0 }, }; int i; @@ -593,7 +593,7 @@ brgphy_fixup_ber_bug(struct mii_softc *sc) { static const struct { int reg; - u_int16_t val; + uint16_t val; } dspcode[] = { { BRGPHY_MII_AUXCTL, 0x0c00 }, { BRGPHY_MII_DSP_ADDR_REG, 0x000a }, @@ -633,7 +633,7 @@ brgphy_fixup_jitter_bug(struct mii_softc *sc) static void brgphy_ethernet_wirespeed(struct mii_softc *sc) { - u_int32_t val; + uint32_t val; /* Enable Ethernet@WireSpeed. */ PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x7007); @@ -645,7 +645,7 @@ static void brgphy_jumbo_settings(struct mii_softc *sc, u_long mtu) { struct brgphy_softc *bsc = (struct brgphy_softc *)sc; - u_int32_t val; + uint32_t val; /* Set or clear jumbo frame settings in the PHY. */ if (mtu > ETHER_MAX_LEN) { @@ -708,10 +708,10 @@ brgphy_reset(struct mii_softc *sc) /* Handle any NetXtreme/bge workarounds. */ if (bge_sc) { /* Fix up various bugs */ - if (bge_sc->bge_flags & BGE_FLAG_ADC_BUG) - brgphy_fixup_adc_bug(sc); if (bge_sc->bge_flags & BGE_FLAG_5704_A0_BUG) brgphy_fixup_5704_a0_bug(sc); + if (bge_sc->bge_flags & BGE_FLAG_ADC_BUG) + brgphy_fixup_adc_bug(sc); if (bge_sc->bge_flags & BGE_FLAG_ADJUST_TRIM) brgphy_fixup_adjust_trim(sc); if (bge_sc->bge_flags & BGE_FLAG_BER_BUG) |
