svn commit: r225567 - user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416

[Adrian Chadd]

Author: adrian
Date: Thu Sep 15 05:05:31 2011
New Revision: 225567
URL: http://svn.freebsd.org/changeset/base/225567

Log:
  Correct the AR_ISR_S5 logic.
  
  This still hasn't fixed the shared interrupt issue, however.
  
  Obtained from:	Atheros

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c	Thu Sep 15 04:34:59 2011	(r225566)
+++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c	Thu Sep 15 05:05:31 2011	(r225567)
@@ -172,7 +172,7 @@ ar5416GetPendingInterrupts(struct ath_ha
 			ahp->ah_intrTxqs |= MS(isr1, AR_ISR_S1_QCU_TXEOL);
 		}
 
-		if (AR_SREV_MERLIN(ah) || AR_SREV_KITE(ah)) {
+		if ((isr & AR_ISR_GENTMR) || (! pCap->halAutoSleepSupport)) {
 			uint32_t isr5;
 			if (pCap->halUseIsrRac) {
 				isr5 = OS_REG_READ(ah, AR_ISR_S5_S);
@@ -181,8 +181,9 @@ ar5416GetPendingInterrupts(struct ath_ha
 				OS_REG_WRITE(ah, AR_ISR_S5, isr5);
 				isr &= ~AR_ISR_GENTMR;
 			}
-			if (isr5 & AR_ISR_S5_TIM_TIMER)
-				*masked |= HAL_INT_TIM_TIMER;
+			if (! pCap->halAutoSleepSupport)
+				if (isr5 & AR_ISR_S5_TIM_TIMER)
+					*masked |= HAL_INT_TIM_TIMER;
 		}
 		*masked |= mask2;
 	}