diff options
| author |   damien <damien@openbsd.org> | 2011-01-01 14:25:03 +0000 |
|---|---|---|
| committer | damien <damien@openbsd.org> | 2011-01-01 14:25:03 +0000 |
| commit | c24760dc4b96d3bb9d02b6f7163b38e731a9cef2 (patch) | |
| tree | a1058a1bfcc804ab82ef77dc6ac3a7d193fe83fd | |
| parent | more AR9380/AR9485 bits. (diff) | |
| download | wireguard-openbsd-c24760dc4b96d3bb9d02b6f7163b38e731a9cef2.tar.xz wireguard-openbsd-c24760dc4b96d3bb9d02b6f7163b38e731a9cef2.zip | |
cleanup, no binary change.
| -rw-r--r-- | sys/dev/ic/ar9280.c | 3 | ||||
| -rw-r--r-- | sys/dev/ic/ar9285.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/ar9380.c | 10 |
3 files changed, 9 insertions, 8 deletions
diff --git a/sys/dev/ic/ar9280.c b/sys/dev/ic/ar9280.c index fa3177dba0e..99a24551dae 100644 --- a/sys/dev/ic/ar9280.c +++ b/sys/dev/ic/ar9280.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar9280.c,v 1.15 2010/12/31 17:50:48 damien Exp $ */ +/* $OpenBSD: ar9280.c,v 1.16 2011/01/01 14:25:03 damien Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -474,7 +474,6 @@ ar9280_spur_mitigate(struct athn_softc *sc, struct ieee80211_channel *c, spurchans = sc->ops.get_spur_chans(sc, IEEE80211_IS_CHAN_2GHZ(c)); for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) { spur = spurchans[i].spurChan; - /* XXX Linux checks this too late? */ if (spur == AR_NO_SPUR) return; /* XXX disable if it was enabled! */ spur /= 10; diff --git a/sys/dev/ic/ar9285.c b/sys/dev/ic/ar9285.c index 57ff3fd1e52..58ff14d922f 100644 --- a/sys/dev/ic/ar9285.c +++ b/sys/dev/ic/ar9285.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar9285.c,v 1.15 2010/12/31 17:50:48 damien Exp $ */ +/* $OpenBSD: ar9285.c,v 1.16 2011/01/01 14:25:03 damien Exp $ */ /*- * Copyright (c) 2009-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -19,7 +19,7 @@ /* * Driver for Atheros 802.11a/g/n chipsets. - * Routines for AR9285 chipsets. + * Routines for AR9285 and AR9271 chipsets. */ #include "bpfilter.h" diff --git a/sys/dev/ic/ar9380.c b/sys/dev/ic/ar9380.c index 8490e7e7604..b52676470a3 100644 --- a/sys/dev/ic/ar9380.c +++ b/sys/dev/ic/ar9380.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar9380.c,v 1.11 2011/01/01 13:44:42 damien Exp $ */ +/* $OpenBSD: ar9380.c,v 1.12 2011/01/01 14:25:03 damien Exp $ */ /*- * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr> @@ -472,6 +472,8 @@ ar9485_pmu_write(struct athn_softc *sc, uint32_t addr, uint32_t val) return (ETIMEDOUT); } +#define ar9486_pmu_read AR_READ + void ar9485_init_swreg(struct athn_softc *sc) { @@ -479,12 +481,12 @@ ar9485_init_swreg(struct athn_softc *sc) uint32_t reg; ar9485_pmu_write(sc, AR_PHY_PMU2, - AR_READ(sc, AR_PHY_PMU2) & ~AR_PHY_PMU2_PGM); + ar9486_pmu_read(sc, AR_PHY_PMU2) & ~AR_PHY_PMU2_PGM); if (eep->baseEepHeader.featureEnable & AR_EEP_INTERNAL_REGULATOR) { ar9485_pmu_write(sc, AR_PHY_PMU1, 0x131dc17a); - reg = AR_READ(sc, AR_PHY_PMU2); + reg = ar9486_pmu_read(sc, AR_PHY_PMU2); reg = (reg & ~0xffc00000) | 0x10000000; ar9485_pmu_write(sc, AR_PHY_PMU2, reg); } else { @@ -493,7 +495,7 @@ ar9485_init_swreg(struct athn_softc *sc) } ar9485_pmu_write(sc, AR_PHY_PMU2, - AR_READ(sc, AR_PHY_PMU2) | AR_PHY_PMU2_PGM); + ar9486_pmu_read(sc, AR_PHY_PMU2) | AR_PHY_PMU2_PGM); } void |