svn commit: r251360 - head/sys/dev/ath/ath_hal

[Adrian Chadd]

Author: adrian
Date: Tue Jun  4 02:56:56 2013
New Revision: 251360
URL: http://svnweb.freebsd.org/changeset/base/251360

Log:
  Add the combined (mixed) diversity support capability bit for the
  AR9285/AR9485.

Modified:
  head/sys/dev/ath/ath_hal/ah.c
  head/sys/dev/ath/ath_hal/ah.h

Modified: head/sys/dev/ath/ath_hal/ah.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.c	Tue Jun  4 02:28:47 2013	(r251359)
+++ head/sys/dev/ath/ath_hal/ah.c	Tue Jun  4 02:56:56 2013	(r251360)
@@ -748,6 +748,9 @@ ath_hal_getcapability(struct ath_hal *ah
 	case HAL_CAP_RXTSTAMP_PREC:	/* rx desc tstamp precision (bits) */
 		*result = pCap->halTstampPrecision;
 		return HAL_OK;
+	case HAL_CAP_ANT_DIV_COMB:	/* AR9285/AR9485 LNA diversity */
+		return pCap->halAntDivCombSupport ? HAL_OK  : HAL_ENOTSUPP;
+
 	case HAL_CAP_ENHANCED_DFS_SUPPORT:
 		return pCap->halEnhancedDfsSupport ? HAL_OK : HAL_ENOTSUPP;
 

Modified: head/sys/dev/ath/ath_hal/ah.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.h	Tue Jun  4 02:28:47 2013	(r251359)
+++ head/sys/dev/ath/ath_hal/ah.h	Tue Jun  4 02:56:56 2013	(r251360)
@@ -169,6 +169,7 @@ typedef enum {
 
 	HAL_CAP_RXTSTAMP_PREC	= 100,	/* rx desc tstamp precision (bits) */
 
+	HAL_CAP_ANT_DIV_COMB	= 105,	/* Enable antenna diversity/combining */
 	HAL_CAP_PHYRESTART_CLR_WAR	= 106,	/* in some cases, clear phy restart to fix bb hang */
 	HAL_CAP_ENTERPRISE_MODE	= 107,	/* Enterprise mode features */
 	HAL_CAP_LDPCWAR		= 108,