diff options
| author | Adrian Chadd <adrian@FreeBSD.org> | 2011-03-31 08:48:05 +0000 |
|---|---|---|
| committer | Adrian Chadd <adrian@FreeBSD.org> | 2011-03-31 08:48:05 +0000 |
| commit | b569f9f5dfc39d09c4050c00e252d6bfce09a692 (patch) | |
| tree | 0db3d1d3c71e986a00de2d037121e3e94f62ad40 | |
| parent | 1c62cc63b6b821191f9c06b54d7042befb9798be (diff) | |
Notes
| -rw-r--r-- | sys/conf/options | 3 | ||||
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c | 4 | ||||
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5416/ar5416_reset.c | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sys/conf/options b/sys/conf/options index 4ede8268c19a..e601ceb786b1 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -786,6 +786,9 @@ AH_USE_INIPDGAIN opt_ah.h AH_MAXCHAN opt_ah.h AH_RXCFG_SDMAMW_4BYTES opt_ah.h +# AR5416 and later interrupt mitigation +AH_AR5416_INTERRUPT_MITIGATION opt_ah.h + # options for the Broadcom BCM43xx driver (bwi) BWI_DEBUG opt_bwi.h BWI_DEBUG_VERBOSE opt_bwi.h diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c b/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c index f866f5917060..f06f469fb5f7 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c @@ -128,7 +128,7 @@ ar5416GetPendingInterrupts(struct ath_hal *ah, HAL_INT *masked) } /* Interrupt Mitigation on AR5416 */ -#ifdef AR5416_INT_MITIGATION +#ifdef AH_AR5416_INTERRUPT_MITIGATION if (isr & (AR_ISR_RXMINTR | AR_ISR_RXINTM)) *masked |= HAL_INT_RX; if (isr & (AR_ISR_TXMINTR | AR_ISR_TXINTM)) @@ -194,7 +194,7 @@ ar5416SetInterrupts(struct ath_hal *ah, HAL_INT ints) mask = ints & HAL_INT_COMMON; mask2 = 0; -#ifdef AR5416_INT_MITIGATION +#ifdef AH_AR5416_INTERRUPT_MITIGATION /* * Overwrite default mask if Interrupt mitigation * is specified for AR5416 diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c b/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c index c5cb9a662ea0..75c0b17a4e6d 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c @@ -305,7 +305,7 @@ ar5416Reset(struct ath_hal *ah, HAL_OPMODE opmode, */ OS_REG_WRITE(ah, AR_OBS, 8); -#ifdef AR5416_INT_MITIGATION +#ifdef AH_AR5416_INTERRUPT_MITIGATION OS_REG_WRITE(ah, AR_MIRT, 0); OS_REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500); @@ -538,7 +538,7 @@ ar5416InitIMR(struct ath_hal *ah, HAL_OPMODE opmode) | AR_IMR_RXERR | AR_IMR_RXORN | AR_IMR_BCNMISC; -#ifdef AR5416_INT_MITIGATION +#ifdef AH_AR5416_INTERRUPT_MITIGATION ahp->ah_maskReg |= AR_IMR_TXINTM | AR_IMR_RXINTM | AR_IMR_TXMINTR | AR_IMR_RXMINTR; #else |