lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath9k_htc: Use CONFIG_ATH9K_BTCOEX_SUPPORT

Browse Source 
ath9k_htc can also make use of CONFIG_ATH9K_BTCOEX_SUPPORT
to be compiled without BTCOEX support.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith Manoharan
2012-02-22 12:41:47 +05:30
committed by John W. Linville
parent cee5341d47
commit 9d5b80fd36
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/wireless/ath/ath9k/htc.h
View File

@@ -400,12 +400,21 @@ struct ath_btcoex {
u32 btscan_no_stomp; u32 btscan_no_stomp;
}; };
#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
void ath9k_htc_init_btcoex(struct ath9k_htc_priv *priv, char *product); void ath9k_htc_init_btcoex(struct ath9k_htc_priv *priv, char *product);
void ath9k_htc_start_btcoex(struct ath9k_htc_priv *priv); void ath9k_htc_start_btcoex(struct ath9k_htc_priv *priv);
void ath9k_htc_stop_btcoex(struct ath9k_htc_priv *priv); void ath9k_htc_stop_btcoex(struct ath9k_htc_priv *priv);
void ath_htc_init_btcoex_work(struct ath9k_htc_priv *priv); #else
void ath_htc_resume_btcoex_work(struct ath9k_htc_priv *priv); static inline void ath9k_htc_init_btcoex(struct ath9k_htc_priv *priv, char *product)
void ath_htc_cancel_btcoex_work(struct ath9k_htc_priv *priv); {
}
static inline void ath9k_htc_start_btcoex(struct ath9k_htc_priv *priv)
{
}
static inline void ath9k_htc_stop_btcoex(struct ath9k_htc_priv *priv)
{
}
#endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */
#define OP_INVALID BIT(0) #define OP_INVALID BIT(0)
#define OP_SCANNING BIT(1) #define OP_SCANNING BIT(1)
@@ -486,7 +495,10 @@ struct ath9k_htc_priv {
int cabq; int cabq;
int hwq_map[WME_NUM_AC]; int hwq_map[WME_NUM_AC];
#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
struct ath_btcoex btcoex; struct ath_btcoex btcoex;
#endif
struct delayed_work coex_period_work; struct delayed_work coex_period_work;
struct delayed_work duty_cycle_work; struct delayed_work duty_cycle_work;
#ifdef CONFIG_ATH9K_HTC_DEBUGFS #ifdef CONFIG_ATH9K_HTC_DEBUGFS

10
drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
View File

@@ -22,6 +22,8 @@
#define ATH_HTC_BTCOEX_PRODUCT_ID "wb193" #define ATH_HTC_BTCOEX_PRODUCT_ID "wb193"
#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
/* /*
* Detects if there is any priority bt traffic * Detects if there is any priority bt traffic
*/ */
@@ -113,7 +115,7 @@ static void ath_btcoex_duty_cycle_work(struct work_struct *work)
ath9k_hw_btcoex_enable(priv->ah); ath9k_hw_btcoex_enable(priv->ah);
} }
void ath_htc_init_btcoex_work(struct ath9k_htc_priv *priv) static void ath_htc_init_btcoex_work(struct ath9k_htc_priv *priv)
{ {
struct ath_btcoex *btcoex = &priv->btcoex; struct ath_btcoex *btcoex = &priv->btcoex;
@@ -133,7 +135,7 @@ void ath_htc_init_btcoex_work(struct ath9k_htc_priv *priv)
* (Re)start btcoex work * (Re)start btcoex work
*/ */
void ath_htc_resume_btcoex_work(struct ath9k_htc_priv *priv) static void ath_htc_resume_btcoex_work(struct ath9k_htc_priv *priv)
{ {
struct ath_btcoex *btcoex = &priv->btcoex; struct ath_btcoex *btcoex = &priv->btcoex;
struct ath_hw *ah = priv->ah; struct ath_hw *ah = priv->ah;
@@ -153,7 +155,7 @@ void ath_htc_resume_btcoex_work(struct ath9k_htc_priv *priv)
/* /*
* Cancel btcoex and bt duty cycle work. * Cancel btcoex and bt duty cycle work.
*/ */
void ath_htc_cancel_btcoex_work(struct ath9k_htc_priv *priv) static void ath_htc_cancel_btcoex_work(struct ath9k_htc_priv *priv)
{ {
if (ath9k_hw_get_btcoex_scheme(priv->ah) == ATH_BTCOEX_CFG_NONE) if (ath9k_hw_get_btcoex_scheme(priv->ah) == ATH_BTCOEX_CFG_NONE)
return; return;
@@ -216,6 +218,8 @@ void ath9k_htc_init_btcoex(struct ath9k_htc_priv *priv, char *product)
} }
} }
#endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */
/*******/ /*******/
/* LED */ /* LED */
/*******/ /*******/