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

[Adrian Chadd]

Author: adrian
Date: Wed Jun  1 01:43:46 2016
New Revision: 301089
URL: https://svnweb.freebsd.org/changeset/base/301089

Log:
  [ath_hal] add extra MCI definitions used by the later chips (QCA9565/Aphrodite).
  
  Obtained from:	Linux ath9k

Modified:
  head/sys/dev/ath/ath_hal/ah_btcoex.h

Modified: head/sys/dev/ath/ath_hal/ah_btcoex.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_btcoex.h	Tue May 31 23:40:21 2016	(r301088)
+++ head/sys/dev/ath/ath_hal/ah_btcoex.h	Wed Jun  1 01:43:46 2016	(r301089)
@@ -488,6 +488,17 @@ typedef enum mci_state_type {
 #define ATH_MCI_CONFIG_CLK_DIV              0x00003000
 #define ATH_MCI_CONFIG_CLK_DIV_S            12
 #define ATH_MCI_CONFIG_DISABLE_TUNING       0x00004000
+#define ATH_MCI_CONFIG_DISABLE_AIC          0x00008000
+#define ATH_MCI_CONFIG_AIC_CAL_NUM_CHAN     0x007f0000
+#define ATH_MCI_CONFIG_AIC_CAL_NUM_CHAN_S   16
+#define ATH_MCI_CONFIG_NO_QUIET_ACK         0x00800000
+#define ATH_MCI_CONFIG_NO_QUIET_ACK_S       23
+#define ATH_MCI_CONFIG_ANT_ARCH             0x07000000
+#define ATH_MCI_CONFIG_ANT_ARCH_S           24
+#define ATH_MCI_CONFIG_FORCE_QUIET_ACK      0x08000000
+#define ATH_MCI_CONFIG_FORCE_QUIET_ACK_S    27
+#define ATH_MCI_CONFIG_FORCE_2CHAIN_ACK     0x10000000
+#define ATH_MCI_CONFIG_MCI_STAT_DBG         0x20000000
 #define ATH_MCI_CONFIG_MCI_WEIGHT_DBG       0x40000000
 #define ATH_MCI_CONFIG_DISABLE_MCI          0x80000000
 
@@ -496,6 +507,16 @@ typedef enum mci_state_type {
                                           ATH_MCI_CONFIG_MCI_OBS_BT )
 #define ATH_MCI_CONFIG_MCI_OBS_GPIO     0x0000002F
 
+#define ATH_MCI_ANT_ARCH_1_ANT_PA_LNA_NON_SHARED 0x00
+#define ATH_MCI_ANT_ARCH_1_ANT_PA_LNA_SHARED     0x01
+#define ATH_MCI_ANT_ARCH_2_ANT_PA_LNA_NON_SHARED 0x02
+#define ATH_MCI_ANT_ARCH_2_ANT_PA_LNA_SHARED     0x03
+#define ATH_MCI_ANT_ARCH_3_ANT                   0x04
+
+#define	MCI_ANT_ARCH_PA_LNA_SHARED(c)		\
+	    ((MS(c, ATH_MCI_CONFIG_ANT_ARCH) == ATH_MCI_ANT_ARCH_1_ANT_PA_LNA_SHARED) || \
+	    (MS(c, ATH_MCI_CONFIG_ANT_ARCH) == ATH_MCI_ANT_ARCH_2_ANT_PA_LNA_SHARED))
+
 #define ATH_MCI_CONCUR_TX_SHARED_CHN    0x01
 #define ATH_MCI_CONCUR_TX_UNSHARED_CHN  0x02
 #define ATH_MCI_CONCUR_TX_DEBUG         0x03