PWN-Hunter/android_kernel_xiaomi_sdm845
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ath9k: replaces SC_OP_BTCOEX_ENABLED with a bool

Browse Source 
Whether or not bluetooth coex has been enabled is a hardware
state and only the hardware helpers will be able to set this.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis R. Rodriguez 2009-09-09 13:44:23 -07:00 committed by John W. Linville
parent bc74bf8fc3
commit 8c1b39547e
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/ath/ath9k/ath9k.h
View File

@ -532,7 +532,6 @@ struct ath_led {
#define SC_OP_WAIT_FOR_PSPOLL_DATA BIT(17) #define SC_OP_WAIT_FOR_PSPOLL_DATA BIT(17)
#define SC_OP_WAIT_FOR_TX_ACK BIT(18) #define SC_OP_WAIT_FOR_TX_ACK BIT(18)
#define SC_OP_BEACON_SYNC BIT(19) #define SC_OP_BEACON_SYNC BIT(19)
#define SC_OP_BTCOEX_ENABLED BIT(20)
#define SC_OP_BT_PRIORITY_DETECTED BIT(21) #define SC_OP_BT_PRIORITY_DETECTED BIT(21)
struct ath_bus_ops { struct ath_bus_ops {

4
drivers/net/wireless/ath/ath9k/btcoex.c
View File

@ -164,7 +164,7 @@ void ath9k_hw_btcoex_enable(struct ath_hw *ah)
(0x2 << (btcoex_info->btactive_gpio * 2)), (0x2 << (btcoex_info->btactive_gpio * 2)),
(0x3 << (btcoex_info->btactive_gpio * 2))); (0x3 << (btcoex_info->btactive_gpio * 2)));
ah->ah_sc->sc_flags |= SC_OP_BTCOEX_ENABLED; ah->btcoex_info.enabled = true;
} }
void ath9k_hw_btcoex_disable(struct ath_hw *ah) void ath9k_hw_btcoex_disable(struct ath_hw *ah)
@ -182,5 +182,5 @@ void ath9k_hw_btcoex_disable(struct ath_hw *ah)
REG_WRITE(ah, AR_BT_COEX_MODE2, 0); REG_WRITE(ah, AR_BT_COEX_MODE2, 0);
} }
ah->ah_sc->sc_flags &= ~SC_OP_BTCOEX_ENABLED; ah->btcoex_info.enabled = false;
} }

1
drivers/net/wireless/ath/ath9k/btcoex.h
View File

@ -64,6 +64,7 @@ struct ath_btcoex_config {
struct ath_btcoex_info { struct ath_btcoex_info {
enum ath_btcoex_scheme btcoex_scheme; enum ath_btcoex_scheme btcoex_scheme;
bool enabled;
u8 wlanactive_gpio; u8 wlanactive_gpio;
u8 btactive_gpio; u8 btactive_gpio;
u8 btpriority_gpio; u8 btpriority_gpio;

2
drivers/net/wireless/ath/ath9k/hw.c
View File

@ -2578,7 +2578,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
#endif #endif
} }
if (ah->ah_sc->sc_flags & SC_OP_BTCOEX_ENABLED) if (ah->btcoex_info.enabled)
ath9k_hw_btcoex_enable(ah); ath9k_hw_btcoex_enable(ah);
return 0; return 0;

4
drivers/net/wireless/ath/ath9k/main.c
View File

@ -2199,7 +2199,7 @@ static int ath9k_start(struct ieee80211_hw *hw)
ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0); ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
if ((ah->btcoex_info.btcoex_scheme != ATH_BTCOEX_CFG_NONE) && if ((ah->btcoex_info.btcoex_scheme != ATH_BTCOEX_CFG_NONE) &&
!(sc->sc_flags & SC_OP_BTCOEX_ENABLED)) { !ah->btcoex_info.enabled) {
ath9k_hw_btcoex_init_weight(ah); ath9k_hw_btcoex_init_weight(ah);
ath9k_hw_btcoex_enable(ah); ath9k_hw_btcoex_enable(ah);
@ -2358,7 +2358,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
return; /* another wiphy still in use */ return; /* another wiphy still in use */
} }
if (sc->sc_flags & SC_OP_BTCOEX_ENABLED) { if (ah->btcoex_info.enabled) {
ath9k_hw_btcoex_disable(ah); ath9k_hw_btcoex_disable(ah);
if (ah->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_3WIRE) if (ah->btcoex_info.btcoex_scheme == ATH_BTCOEX_CFG_3WIRE)
ath9k_btcoex_timer_pause(sc); ath9k_btcoex_timer_pause(sc);