Author: adrian
Date: Fri Apr 5 07:41:47 2013
New Revision: 249131
URL: http://svnweb.freebsd.org/changeset/base/249131
Log:
HAL additions to enable MCI Bluetooth coexistence in the AR9300 HAL.
* Add the rest of the missing GPIO output mux types;
* Add in a new debug category;
* And a new MCI btcoex configuration option in ath_hal.ah_config
Obtained from: Qualcomm Atheros
Modified:
head/sys/dev/ath/ath_hal/ah.h
head/sys/dev/ath/ath_hal/ah_debug.h
Modified: head/sys/dev/ath/ath_hal/ah.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.h Fri Apr 5 06:55:19 2013
(r249130)
+++ head/sys/dev/ath/ath_hal/ah.h Fri Apr 5 07:41:47 2013
(r249131)
@@ -566,7 +566,22 @@ typedef enum {
HAL_GPIO_OUTPUT_MUX_MAC_NETWORK_LED = 3,
HAL_GPIO_OUTPUT_MUX_MAC_POWER_LED = 4,
HAL_GPIO_OUTPUT_MUX_AS_WLAN_ACTIVE = 5,
- HAL_GPIO_OUTPUT_MUX_AS_TX_FRAME = 6
+ HAL_GPIO_OUTPUT_MUX_AS_TX_FRAME = 6,
+
+ HAL_GPIO_OUTPUT_MUX_AS_MCI_WLAN_DATA,
+ HAL_GPIO_OUTPUT_MUX_AS_MCI_WLAN_CLK,
+ HAL_GPIO_OUTPUT_MUX_AS_MCI_BT_DATA,
+ HAL_GPIO_OUTPUT_MUX_AS_MCI_BT_CLK,
+ HAL_GPIO_OUTPUT_MUX_AS_WL_IN_TX,
+ HAL_GPIO_OUTPUT_MUX_AS_WL_IN_RX,
+ HAL_GPIO_OUTPUT_MUX_AS_BT_IN_TX,
+ HAL_GPIO_OUTPUT_MUX_AS_BT_IN_RX,
+ HAL_GPIO_OUTPUT_MUX_AS_RUCKUS_STROBE,
+ HAL_GPIO_OUTPUT_MUX_AS_RUCKUS_DATA,
+ HAL_GPIO_OUTPUT_MUX_AS_SMARTANT_CTRL0,
+ HAL_GPIO_OUTPUT_MUX_AS_SMARTANT_CTRL1,
+ HAL_GPIO_OUTPUT_MUX_AS_SMARTANT_CTRL2,
+ HAL_GPIO_OUTPUT_MUX_NUM_ENTRIES
} HAL_GPIO_MUX_TYPE;
typedef enum {
@@ -1074,6 +1089,8 @@ typedef enum {
HAL_BT_COEX_SET_ACK_PWR = 0, /* Change ACK power setting */
HAL_BT_COEX_LOWER_TX_PWR, /* Change transmit power */
HAL_BT_COEX_ANTENNA_DIVERSITY, /* Enable RX diversity for Kite */
+ HAL_BT_COEX_MCI_MAX_TX_PWR, /* Set max tx power for concurrent tx */
+ HAL_BT_COEX_MCI_FTP_STOMP_RX, /* Use a different weight for stomp low
*/
} HAL_BT_COEX_SET_PARAMETER;
#define HAL_BT_COEX_FLAG_LOW_ACK_PWR 0x00000001
@@ -1244,6 +1261,7 @@ typedef struct
int ath_hal_ant_ctrl_comm2g_switch_enable;
int ath_hal_ext_atten_margin_cfg;
int ath_hal_war70c;
+ uint32_t ath_hal_mci_config;
} HAL_OPS_CONFIG;
/*
Modified: head/sys/dev/ath/ath_hal/ah_debug.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_debug.h Fri Apr 5 06:55:19 2013
(r249130)
+++ head/sys/dev/ath/ath_hal/ah_debug.h Fri Apr 5 07:41:47 2013
(r249131)
@@ -53,6 +53,7 @@ enum {
HAL_DEBUG_QUEUE = 0x04000000,
HAL_DEBUG_PRINT_REG = 0x08000000,
HAL_DEBUG_FCS_RTT = 0x10000000,
+ HAL_DEBUG_BT_COEX = 0x20000000,
HAL_DEBUG_UNMASKABLE = 0x80000000, /* always printed */
HAL_DEBUG_ANY = 0xffffffff
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
