diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/htc.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc.h | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 43b9e21bc562..75ecf6a30d25 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h | |||
@@ -316,17 +316,32 @@ struct htc_beacon_config { | |||
316 | u8 dtim_count; | 316 | u8 dtim_count; |
317 | }; | 317 | }; |
318 | 318 | ||
319 | #define OP_INVALID BIT(0) | 319 | struct ath_btcoex { |
320 | #define OP_SCANNING BIT(1) | 320 | u32 bt_priority_cnt; |
321 | #define OP_FULL_RESET BIT(2) | 321 | unsigned long bt_priority_time; |
322 | #define OP_LED_ASSOCIATED BIT(3) | 322 | int bt_stomp_type; /* Types of BT stomping */ |
323 | #define OP_LED_ON BIT(4) | 323 | u32 btcoex_no_stomp; |
324 | #define OP_PREAMBLE_SHORT BIT(5) | 324 | u32 btcoex_period; |
325 | #define OP_PROTECT_ENABLE BIT(6) | 325 | u32 btscan_no_stomp; |
326 | #define OP_ASSOCIATED BIT(7) | 326 | }; |
327 | #define OP_ENABLE_BEACON BIT(8) | 327 | |
328 | #define OP_LED_DEINIT BIT(9) | 328 | void ath_htc_init_btcoex_work(struct ath9k_htc_priv *priv); |
329 | #define OP_UNPLUGGED BIT(10) | 329 | void ath_htc_resume_btcoex_work(struct ath9k_htc_priv *priv); |
330 | void ath_htc_cancel_btcoex_work(struct ath9k_htc_priv *priv); | ||
331 | |||
332 | #define OP_INVALID BIT(0) | ||
333 | #define OP_SCANNING BIT(1) | ||
334 | #define OP_FULL_RESET BIT(2) | ||
335 | #define OP_LED_ASSOCIATED BIT(3) | ||
336 | #define OP_LED_ON BIT(4) | ||
337 | #define OP_PREAMBLE_SHORT BIT(5) | ||
338 | #define OP_PROTECT_ENABLE BIT(6) | ||
339 | #define OP_ASSOCIATED BIT(7) | ||
340 | #define OP_ENABLE_BEACON BIT(8) | ||
341 | #define OP_LED_DEINIT BIT(9) | ||
342 | #define OP_UNPLUGGED BIT(10) | ||
343 | #define OP_BT_PRIORITY_DETECTED BIT(11) | ||
344 | #define OP_BT_SCAN BIT(12) | ||
330 | 345 | ||
331 | struct ath9k_htc_priv { | 346 | struct ath9k_htc_priv { |
332 | struct device *dev; | 347 | struct device *dev; |
@@ -391,6 +406,9 @@ struct ath9k_htc_priv { | |||
391 | int cabq; | 406 | int cabq; |
392 | int hwq_map[WME_NUM_AC]; | 407 | int hwq_map[WME_NUM_AC]; |
393 | 408 | ||
409 | struct ath_btcoex btcoex; | ||
410 | struct delayed_work coex_period_work; | ||
411 | struct delayed_work duty_cycle_work; | ||
394 | #ifdef CONFIG_ATH9K_HTC_DEBUGFS | 412 | #ifdef CONFIG_ATH9K_HTC_DEBUGFS |
395 | struct ath9k_debug debug; | 413 | struct ath9k_debug debug; |
396 | #endif | 414 | #endif |
@@ -443,7 +461,7 @@ void ath9k_init_leds(struct ath9k_htc_priv *priv); | |||
443 | void ath9k_deinit_leds(struct ath9k_htc_priv *priv); | 461 | void ath9k_deinit_leds(struct ath9k_htc_priv *priv); |
444 | 462 | ||
445 | int ath9k_htc_probe_device(struct htc_target *htc_handle, struct device *dev, | 463 | int ath9k_htc_probe_device(struct htc_target *htc_handle, struct device *dev, |
446 | u16 devid); | 464 | u16 devid, char *product); |
447 | void ath9k_htc_disconnect_device(struct htc_target *htc_handle, bool hotunplug); | 465 | void ath9k_htc_disconnect_device(struct htc_target *htc_handle, bool hotunplug); |
448 | #ifdef CONFIG_PM | 466 | #ifdef CONFIG_PM |
449 | int ath9k_htc_resume(struct htc_target *htc_handle); | 467 | int ath9k_htc_resume(struct htc_target *htc_handle); |