diff options
author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-03-18 06:26:30 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-03-23 16:50:19 -0400 |
commit | 1b00f546fc4271d94c1bccb1955ce64d9ace1000 (patch) | |
tree | f004609cc4913ae97f32c2e16fd7aad5d0aced95 /drivers/net/wireless/wl12xx/wl1271_acx.h | |
parent | 885c9907440947a4f50d4c7a93b1a45266b00b84 (diff) |
wl1271: Add proper WLAN-BT co-ex configuration, and enable co-ex.
Add configuration values for the varous WLAN-BT co-ex configuration parameters,
and finally enable WLAN-BT co-ex. Based on preliminary measurements, it
appears the co-ex feature is not increasing WLAN power consumption, if BT
is not activated.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_acx.h')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_acx.h | 62 |
1 files changed, 1 insertions, 61 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.h b/drivers/net/wireless/wl12xx/wl1271_acx.h index 88a05cbd345..dee3c06a717 100644 --- a/drivers/net/wireless/wl12xx/wl1271_acx.h +++ b/drivers/net/wireless/wl12xx/wl1271_acx.h | |||
@@ -392,12 +392,6 @@ struct acx_conn_monit_params { | |||
392 | __le32 bss_lose_timeout; /* number of TU's from synch fail */ | 392 | __le32 bss_lose_timeout; /* number of TU's from synch fail */ |
393 | } __attribute__ ((packed)); | 393 | } __attribute__ ((packed)); |
394 | 394 | ||
395 | enum { | ||
396 | ACX_SG_DISABLE = 0, | ||
397 | ACX_SG_PROTECTIVE, | ||
398 | ACX_SG_OPPORTUNISTIC | ||
399 | }; | ||
400 | |||
401 | struct acx_bt_wlan_coex { | 395 | struct acx_bt_wlan_coex { |
402 | struct acx_header header; | 396 | struct acx_header header; |
403 | 397 | ||
@@ -405,64 +399,10 @@ struct acx_bt_wlan_coex { | |||
405 | u8 pad[3]; | 399 | u8 pad[3]; |
406 | } __attribute__ ((packed)); | 400 | } __attribute__ ((packed)); |
407 | 401 | ||
408 | enum { | ||
409 | ACX_SG_BT_PER_THRESHOLD = 0, | ||
410 | ACX_SG_HV3_MAX_OVERRIDE, | ||
411 | ACX_SG_BT_NFS_SAMPLE_INTERVAL, | ||
412 | ACX_SG_BT_LOAD_RATIO, | ||
413 | ACX_SG_AUTO_PS_MODE, | ||
414 | ACX_SG_AUTO_SCAN_PROBE_REQ, | ||
415 | ACX_SG_ACTIVE_SCAN_DURATION_FACTOR_HV3, | ||
416 | ACX_SG_ANTENNA_CONFIGURATION, | ||
417 | ACX_SG_BEACON_MISS_PERCENT, | ||
418 | ACX_SG_RATE_ADAPT_THRESH, | ||
419 | ACX_SG_RATE_ADAPT_SNR, | ||
420 | ACX_SG_WLAN_PS_BT_ACL_MASTER_MIN_BR, | ||
421 | ACX_SG_WLAN_PS_BT_ACL_MASTER_MAX_BR, | ||
422 | ACX_SG_WLAN_PS_MAX_BT_ACL_MASTER_BR, | ||
423 | ACX_SG_WLAN_PS_BT_ACL_SLAVE_MIN_BR, | ||
424 | ACX_SG_WLAN_PS_BT_ACL_SLAVE_MAX_BR, | ||
425 | ACX_SG_WLAN_PS_MAX_BT_ACL_SLAVE_BR, | ||
426 | ACX_SG_WLAN_PS_BT_ACL_MASTER_MIN_EDR, | ||
427 | ACX_SG_WLAN_PS_BT_ACL_MASTER_MAX_EDR, | ||
428 | ACX_SG_WLAN_PS_MAX_BT_ACL_MASTER_EDR, | ||
429 | ACX_SG_WLAN_PS_BT_ACL_SLAVE_MIN_EDR, | ||
430 | ACX_SG_WLAN_PS_BT_ACL_SLAVE_MAX_EDR, | ||
431 | ACX_SG_WLAN_PS_MAX_BT_ACL_SLAVE_EDR, | ||
432 | ACX_SG_RXT, | ||
433 | ACX_SG_TXT, | ||
434 | ACX_SG_ADAPTIVE_RXT_TXT, | ||
435 | ACX_SG_PS_POLL_TIMEOUT, | ||
436 | ACX_SG_UPSD_TIMEOUT, | ||
437 | ACX_SG_WLAN_ACTIVE_BT_ACL_MASTER_MIN_EDR, | ||
438 | ACX_SG_WLAN_ACTIVE_BT_ACL_MASTER_MAX_EDR, | ||
439 | ACX_SG_WLAN_ACTIVE_MAX_BT_ACL_MASTER_EDR, | ||
440 | ACX_SG_WLAN_ACTIVE_BT_ACL_SLAVE_MIN_EDR, | ||
441 | ACX_SG_WLAN_ACTIVE_BT_ACL_SLAVE_MAX_EDR, | ||
442 | ACX_SG_WLAN_ACTIVE_MAX_BT_ACL_SLAVE_EDR, | ||
443 | ACX_SG_WLAN_ACTIVE_BT_ACL_MIN_BR, | ||
444 | ACX_SG_WLAN_ACTIVE_BT_ACL_MAX_BR, | ||
445 | ACX_SG_WLAN_ACTIVE_MAX_BT_ACL_BR, | ||
446 | ACX_SG_PASSIVE_SCAN_DURATION_FACTOR_HV3, | ||
447 | ACX_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP, | ||
448 | ACX_SG_PASSIVE_SCAN_A2DP_BT_TIME, | ||
449 | ACX_SG_PASSIVE_SCAN_A2DP_WLAN_TIME, | ||
450 | ACX_SG_HV3_MAX_SERVED, | ||
451 | ACX_SG_DHCP_TIME, | ||
452 | ACX_SG_ACTIVE_SCAN_DURATION_FACTOR_A2DP, | ||
453 | ACX_SG_TEMP_PARAM_1, | ||
454 | ACX_SG_TEMP_PARAM_2, | ||
455 | ACX_SG_TEMP_PARAM_3, | ||
456 | ACX_SG_TEMP_PARAM_4, | ||
457 | ACX_SG_TEMP_PARAM_5, | ||
458 | ACX_SG_PARAMS_MAX, | ||
459 | ACX_SG_PARAMS_ALL = 0xff | ||
460 | }; | ||
461 | |||
462 | struct acx_bt_wlan_coex_param { | 402 | struct acx_bt_wlan_coex_param { |
463 | struct acx_header header; | 403 | struct acx_header header; |
464 | 404 | ||
465 | __le32 params[ACX_SG_PARAMS_MAX]; | 405 | __le32 params[CONF_SG_PARAMS_MAX]; |
466 | u8 param_idx; | 406 | u8 param_idx; |
467 | u8 padding[3]; | 407 | u8 padding[3]; |
468 | } __attribute__ ((packed)); | 408 | } __attribute__ ((packed)); |