diff options
| author | gavin <gavin@FreeBSD.org> | 2012-09-19 12:27:23 +0000 |
|---|---|---|
| committer | gavin <gavin@FreeBSD.org> | 2012-09-19 12:27:23 +0000 |
| commit | 274e5948cc44f9bdef7d96b128143fbedd83a5f2 (patch) | |
| tree | 3f394f93c5ea4f518737a9e08fd86e7af882dc69 /sys/dev/alc | |
| parent | 199045d17c4c0b10c7089126434c8411864c298b (diff) | |
| download | FreeBSD-src-274e5948cc44f9bdef7d96b128143fbedd83a5f2.zip FreeBSD-src-274e5948cc44f9bdef7d96b128143fbedd83a5f2.tar.gz | |
Switch some PCI register reads from using magic numbers to using the names
defined in pcireg.h
MFC after: 1 week
Diffstat (limited to 'sys/dev/alc')
| -rw-r--r-- | sys/dev/alc/if_alc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/alc/if_alc.c b/sys/dev/alc/if_alc.c index 2a0ddb2..9fa29b8 100644 --- a/sys/dev/alc/if_alc.c +++ b/sys/dev/alc/if_alc.c @@ -694,10 +694,10 @@ alc_aspm(struct alc_softc *sc, int media) if ((sc->alc_flags & ALC_FLAG_APS) != 0) { /* Disable extended sync except AR8152 B v1.0 */ - linkcfg &= ~0x80; + linkcfg &= ~PCIEM_LINK_CTL_EXTENDED_SYNC; if (sc->alc_ident->deviceid == DEVICEID_ATHEROS_AR8152_B && sc->alc_rev == ATHEROS_AR8152_B_V10) - linkcfg |= 0x80; + linkcfg |= PCIEM_LINK_CTL_EXTENDED_SYNC; CSR_WRITE_2(sc, sc->alc_expcap + PCIER_LINK_CTL, linkcfg); pmcfg &= ~(PM_CFG_EN_BUFS_RX_L0S | PM_CFG_SA_DLY_ENB | @@ -834,15 +834,15 @@ alc_attach(device_t dev) cap = CSR_READ_2(sc, base + PCIER_LINK_CAP); if ((cap & PCIEM_LINK_CAP_ASPM) != 0) { ctl = CSR_READ_2(sc, base + PCIER_LINK_CTL); - if ((ctl & 0x08) != 0) + if ((ctl & PCIEM_LINK_CTL_RCB) != 0) sc->alc_rcb = DMA_CFG_RCB_128; if (bootverbose) device_printf(dev, "RCB %u bytes\n", sc->alc_rcb == DMA_CFG_RCB_64 ? 64 : 128); - state = ctl & 0x03; - if (state & 0x01) + state = ctl & PCIEM_LINK_CTL_ASPMC; + if (state & PCIEM_LINK_CTL_ASPMC_L0S) sc->alc_flags |= ALC_FLAG_L0S; - if (state & 0x02) + if (state & PCIEM_LINK_CTL_ASPMC_L1) sc->alc_flags |= ALC_FLAG_L1S; if (bootverbose) device_printf(sc->alc_dev, "ASPM %s %s\n", |
