diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-02-19 08:00:18 -0500 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-12 03:57:45 -0400 |
commit | aee8bf5d269ace14f8b31daff34add21b802e7cd (patch) | |
tree | f4150311c5e0cb87c47b691373be1dfdbc1610af /drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | |
parent | 9b666db49253f7d65833dd02c00a2b026309c619 (diff) |
iwlwifi: mvm: BT Coex - update the new API
The firmware was not using the new API, so we don't need to
differentiate between the different stages of this new API.
The main difference here is that most of the hard coded
values are not sent through the command anymore.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h index f3b11897991e..d398a6102805 100644 --- a/drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h +++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | |||
@@ -235,36 +235,12 @@ enum iwl_bt_coex_enabled_modules { | |||
235 | * struct iwl_bt_coex_cmd - bt coex configuration command | 235 | * struct iwl_bt_coex_cmd - bt coex configuration command |
236 | * @mode: enum %iwl_bt_coex_mode | 236 | * @mode: enum %iwl_bt_coex_mode |
237 | * @enabled_modules: enum %iwl_bt_coex_enabled_modules | 237 | * @enabled_modules: enum %iwl_bt_coex_enabled_modules |
238 | * @max_kill: max count of Tx retries due to kill from PTA | ||
239 | * @override_primary_lut: enum %iwl_bt_coex_lut_type: BT_COEX_INVALID_LUT | ||
240 | * should be set by default | ||
241 | * @override_secondary_lut: enum %iwl_bt_coex_lut_type: BT_COEX_INVALID_LUT | ||
242 | * should be set by default | ||
243 | * @bt4_antenna_isolation_thr: antenna threshold value | ||
244 | * @bt4_tx_tx_delta_freq_thr: TxTx delta frequency | ||
245 | * @bt4_tx_rx_max_freq0: TxRx max frequency | ||
246 | * @multiprio_lut: multi priority LUT configuration | ||
247 | * @mplut_prio_boost: BT priority boost registers | ||
248 | * @decision_lut: PTA decision LUT, per Prio-Ch | ||
249 | * | 238 | * |
250 | * The structure is used for the BT_COEX command. | 239 | * The structure is used for the BT_COEX command. |
251 | */ | 240 | */ |
252 | struct iwl_bt_coex_cmd { | 241 | struct iwl_bt_coex_cmd { |
253 | __le32 mode; | 242 | __le32 mode; |
254 | __le32 enabled_modules; | 243 | __le32 enabled_modules; |
255 | |||
256 | __le32 max_kill; | ||
257 | __le32 override_primary_lut; | ||
258 | __le32 override_secondary_lut; | ||
259 | __le32 bt4_antenna_isolation_thr; | ||
260 | |||
261 | __le32 bt4_tx_tx_delta_freq_thr; | ||
262 | __le32 bt4_tx_rx_max_freq0; | ||
263 | |||
264 | __le32 multiprio_lut[BT_COEX_MULTI_PRIO_LUT_SIZE]; | ||
265 | __le32 mplut_prio_boost[BT_COEX_BOOST_SIZE]; | ||
266 | |||
267 | __le32 decision_lut[BT_COEX_MAX_LUT][BT_COEX_LUT_SIZE]; | ||
268 | } __packed; /* BT_COEX_CMD_API_S_VER_6 */ | 244 | } __packed; /* BT_COEX_CMD_API_S_VER_6 */ |
269 | 245 | ||
270 | /** | 246 | /** |
@@ -280,29 +256,6 @@ struct iwl_bt_coex_corun_lut_update_cmd { | |||
280 | } __packed; /* BT_COEX_UPDATE_CORUN_LUT_API_S_VER_1 */ | 256 | } __packed; /* BT_COEX_UPDATE_CORUN_LUT_API_S_VER_1 */ |
281 | 257 | ||
282 | /** | 258 | /** |
283 | * struct iwl_bt_coex_sw_boost - SW boost values | ||
284 | * @wifi_tx_prio_boost: SW boost of wifi tx priority | ||
285 | * @wifi_rx_prio_boost: SW boost of wifi rx priority | ||
286 | * @kill_ack_msk: kill ACK mask. 1 - Tx ACK, 0 - kill Tx of ACK. | ||
287 | * @kill_cts_msk: kill CTS mask. 1 - Tx CTS, 0 - kill Tx of CTS. | ||
288 | */ | ||
289 | struct iwl_bt_coex_sw_boost { | ||
290 | __le32 wifi_tx_prio_boost; | ||
291 | __le32 wifi_rx_prio_boost; | ||
292 | __le32 kill_ack_msk; | ||
293 | __le32 kill_cts_msk; | ||
294 | }; | ||
295 | |||
296 | /** | ||
297 | * struct iwl_bt_coex_sw_boost_update_cmd - command to update the SW boost | ||
298 | * @boost_values: check struct %iwl_bt_coex_sw_boost - one for each channel | ||
299 | * primary / secondary / low priority | ||
300 | */ | ||
301 | struct iwl_bt_coex_sw_boost_update_cmd { | ||
302 | struct iwl_bt_coex_sw_boost boost_values[3]; | ||
303 | } __packed; /* BT_COEX_UPDATE_SW_BOOST_S_VER_1 */ | ||
304 | |||
305 | /** | ||
306 | * struct iwl_bt_coex_reduced_txp_update_cmd | 259 | * struct iwl_bt_coex_reduced_txp_update_cmd |
307 | * @reduced_txp: bit BT_REDUCED_TX_POWER_BIT to enable / disable, rest of the | 260 | * @reduced_txp: bit BT_REDUCED_TX_POWER_BIT to enable / disable, rest of the |
308 | * bits are the sta_id (value) | 261 | * bits are the sta_id (value) |