Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 3 Mar 2010 17:42:39 +0000 (UTC)
From:      Rui Paulo <rpaulo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r204645 - in head/sys/dev/ath/ath_hal: . ar5212
Message-ID:  <201003031742.o23Hgdal019529@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: rpaulo
Date: Wed Mar  3 17:42:39 2010
New Revision: 204645
URL: http://svn.freebsd.org/changeset/base/204645

Log:
  Introduce ath_hal_setInterrupts(), a macro for ah_setInterrupts().
  
  Pointed out by:	sam

Modified:
  head/sys/dev/ath/ath_hal/ah_internal.h
  head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c

Modified: head/sys/dev/ath/ath_hal/ah_internal.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_internal.h	Wed Mar  3 17:32:32 2010	(r204644)
+++ head/sys/dev/ath/ath_hal/ah_internal.h	Wed Mar  3 17:42:39 2010	(r204645)
@@ -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)	\

Modified: head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c	Wed Mar  3 17:32:32 2010	(r204644)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c	Wed Mar  3 17:42:39 2010	(r204645)
@@ -54,7 +54,7 @@ ar5212UpdateTxTrigLevel(struct ath_hal *
 	/*
 	 * 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 *
 	ahp->ah_txTrigLev = newLevel;
 
 	/* re-enable chip interrupts */
-	ah->ah_setInterrupts(ah, omask);
+	ath_hal_setInterrupts(ah, omask);
 
 	return (newLevel != curLevel);
 }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003031742.o23Hgdal019529>