From 26fa382da694c473dd98c264c7761ac7b29b011b Mon Sep 17 00:00:00 2001 From: rpaulo Date: Wed, 3 Mar 2010 17:42:39 +0000 Subject: Introduce ath_hal_setInterrupts(), a macro for ah_setInterrupts(). Pointed out by: sam --- sys/dev/ath/ath_hal/ah_internal.h | 2 ++ sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/ath/ath_hal/ah_internal.h b/sys/dev/ath/ath_hal/ah_internal.h index 8f7ba65..3791639 100644 --- a/sys/dev/ath/ath_hal/ah_internal.h +++ b/sys/dev/ath/ath_hal/ah_internal.h @@ -334,6 +334,8 @@ struct ath_hal_private { (_ah)->ah_configPCIE(_ah, _reset) #define ath_hal_disablePCIE(_ah) \ (_ah)->ah_disablePCIE(_ah) +#define ath_hal_setInterrupts(_ah, _mask) \ + (_ah)->ah_setInterrupts(_ah, _mask) #define ath_hal_eepromDetach(_ah) do { \ if (AH_PRIVATE(_ah)->ah_eepromDetach != AH_NULL) \ diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c b/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c index ed9de14..8b8a921 100644 --- a/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c +++ b/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c @@ -54,7 +54,7 @@ ar5212UpdateTxTrigLevel(struct ath_hal *ah, HAL_BOOL bIncTrigLevel) /* * Disable interrupts while futzing with the fifo level. */ - omask = ah->ah_setInterrupts(ah, ahp->ah_maskReg &~ HAL_INT_GLOBAL); + omask = ath_hal_setInterrupts(ah, ahp->ah_maskReg &~ HAL_INT_GLOBAL); txcfg = OS_REG_READ(ah, AR_TXCFG); curLevel = MS(txcfg, AR_FTRIG); @@ -72,7 +72,7 @@ ar5212UpdateTxTrigLevel(struct ath_hal *ah, HAL_BOOL bIncTrigLevel) ahp->ah_txTrigLev = newLevel; /* re-enable chip interrupts */ - ah->ah_setInterrupts(ah, omask); + ath_hal_setInterrupts(ah, omask); return (newLevel != curLevel); } -- cgit v1.1