wlcore: split wl12xx/wl18xx sg parameters
[cascardo/linux.git] / drivers / net / wireless / ti / wl18xx / main.c
index 50cce42..7869c3c 100644 (file)
@@ -177,69 +177,80 @@ enum wl18xx_hw_rates {
 static struct wlcore_conf wl18xx_conf = {
        .sg = {
                .params = {
-                       [CONF_SG_ACL_BT_MASTER_MIN_BR] = 10,
-                       [CONF_SG_ACL_BT_MASTER_MAX_BR] = 180,
-                       [CONF_SG_ACL_BT_SLAVE_MIN_BR] = 10,
-                       [CONF_SG_ACL_BT_SLAVE_MAX_BR] = 180,
-                       [CONF_SG_ACL_BT_MASTER_MIN_EDR] = 10,
-                       [CONF_SG_ACL_BT_MASTER_MAX_EDR] = 80,
-                       [CONF_SG_ACL_BT_SLAVE_MIN_EDR] = 10,
-                       [CONF_SG_ACL_BT_SLAVE_MAX_EDR] = 80,
-                       [CONF_SG_ACL_WLAN_PS_MASTER_BR] = 8,
-                       [CONF_SG_ACL_WLAN_PS_SLAVE_BR] = 8,
-                       [CONF_SG_ACL_WLAN_PS_MASTER_EDR] = 20,
-                       [CONF_SG_ACL_WLAN_PS_SLAVE_EDR] = 20,
-                       [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_BR] = 20,
-                       [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_BR] = 35,
-                       [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_BR] = 16,
-                       [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_BR] = 35,
-                       [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MIN_EDR] = 32,
-                       [CONF_SG_ACL_WLAN_ACTIVE_MASTER_MAX_EDR] = 50,
-                       [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MIN_EDR] = 28,
-                       [CONF_SG_ACL_WLAN_ACTIVE_SLAVE_MAX_EDR] = 50,
-                       [CONF_SG_ACL_ACTIVE_SCAN_WLAN_BR] = 10,
-                       [CONF_SG_ACL_ACTIVE_SCAN_WLAN_EDR] = 20,
-                       [CONF_SG_ACL_PASSIVE_SCAN_BT_BR] = 75,
-                       [CONF_SG_ACL_PASSIVE_SCAN_WLAN_BR] = 15,
-                       [CONF_SG_ACL_PASSIVE_SCAN_BT_EDR] = 27,
-                       [CONF_SG_ACL_PASSIVE_SCAN_WLAN_EDR] = 17,
-                       /* active scan params */
-                       [CONF_SG_AUTO_SCAN_PROBE_REQ] = 170,
-                       [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_HV3] = 50,
-                       [CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_A2DP] = 100,
-                       /* passive scan params */
-                       [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP_BR] = 800,
-                       [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_A2DP_EDR] = 200,
-                       [CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_HV3] = 200,
-                       /* passive scan in dual antenna params */
-                       [CONF_SG_CONSECUTIVE_HV3_IN_PASSIVE_SCAN] = 0,
-                       [CONF_SG_BCN_HV3_COLLISION_THRESH_IN_PASSIVE_SCAN] = 0,
-                       [CONF_SG_TX_RX_PROTECTION_BWIDTH_IN_PASSIVE_SCAN] = 0,
-                       /* general params */
-                       [CONF_SG_STA_FORCE_PS_IN_BT_SCO] = 1,
-                       [CONF_SG_ANTENNA_CONFIGURATION] = 0,
-                       [CONF_SG_BEACON_MISS_PERCENT] = 60,
-                       [CONF_SG_DHCP_TIME] = 5000,
-                       [CONF_SG_RXT] = 1200,
-                       [CONF_SG_TXT] = 1000,
-                       [CONF_SG_ADAPTIVE_RXT_TXT] = 1,
-                       [CONF_SG_GENERAL_USAGE_BIT_MAP] = 3,
-                       [CONF_SG_HV3_MAX_SERVED] = 6,
-                       [CONF_SG_PS_POLL_TIMEOUT] = 10,
-                       [CONF_SG_UPSD_TIMEOUT] = 10,
-                       [CONF_SG_CONSECUTIVE_CTS_THRESHOLD] = 2,
-                       [CONF_SG_STA_RX_WINDOW_AFTER_DTIM] = 5,
-                       [CONF_SG_STA_CONNECTION_PROTECTION_TIME] = 30,
-                       /* AP params */
-                       [CONF_AP_BEACON_MISS_TX] = 3,
-                       [CONF_AP_RX_WINDOW_AFTER_BEACON] = 10,
-                       [CONF_AP_BEACON_WINDOW_INTERVAL] = 2,
-                       [CONF_AP_CONNECTION_PROTECTION_TIME] = 0,
-                       [CONF_AP_BT_ACL_VAL_BT_SERVE_TIME] = 25,
-                       [CONF_AP_BT_ACL_VAL_WL_SERVE_TIME] = 25,
-                       /* CTS Diluting params */
-                       [CONF_SG_CTS_DILUTED_BAD_RX_PACKETS_TH] = 0,
-                       [CONF_SG_CTS_CHOP_IN_DUAL_ANT_SCO_MASTER] = 0,
+                       [WL18XX_CONF_SG_PARAM_0] = 0,
+                       /* Configuartion Parameters */
+                       [WL18XX_CONF_SG_ANTENNA_CONFIGURATION] = 0,
+                       [WL18XX_CONF_SG_ZIGBEE_COEX] = 0,
+                       [WL18XX_CONF_SG_TIME_SYNC] = 0,
+                       [WL18XX_CONF_SG_PARAM_4] = 0,
+                       [WL18XX_CONF_SG_PARAM_5] = 0,
+                       [WL18XX_CONF_SG_PARAM_6] = 0,
+                       [WL18XX_CONF_SG_PARAM_7] = 0,
+                       [WL18XX_CONF_SG_PARAM_8] = 0,
+                       [WL18XX_CONF_SG_PARAM_9] = 0,
+                       [WL18XX_CONF_SG_PARAM_10] = 0,
+                       [WL18XX_CONF_SG_PARAM_11] = 0,
+                       [WL18XX_CONF_SG_PARAM_12] = 0,
+                       [WL18XX_CONF_SG_PARAM_13] = 0,
+                       [WL18XX_CONF_SG_PARAM_14] = 0,
+                       [WL18XX_CONF_SG_PARAM_15] = 0,
+                       [WL18XX_CONF_SG_PARAM_16] = 0,
+                       [WL18XX_CONF_SG_PARAM_17] = 0,
+                       [WL18XX_CONF_SG_PARAM_18] = 0,
+                       [WL18XX_CONF_SG_PARAM_19] = 0,
+                       [WL18XX_CONF_SG_PARAM_20] = 0,
+                       [WL18XX_CONF_SG_PARAM_21] = 0,
+                       [WL18XX_CONF_SG_PARAM_22] = 0,
+                       [WL18XX_CONF_SG_PARAM_23] = 0,
+                       [WL18XX_CONF_SG_PARAM_24] = 0,
+                       [WL18XX_CONF_SG_PARAM_25] = 0,
+                       /* Active Scan Parameters */
+                       [WL18XX_CONF_SG_AUTO_SCAN_PROBE_REQ] = 170,
+                       [WL18XX_CONF_SG_ACTIVE_SCAN_DURATION_FACTOR_HV3] = 50,
+                       [WL18XX_CONF_SG_PARAM_28] = 0,
+                       /* Passive Scan Parameters */
+                       [WL18XX_CONF_SG_PARAM_29] = 0,
+                       [WL18XX_CONF_SG_PARAM_30] = 0,
+                       [WL18XX_CONF_SG_PASSIVE_SCAN_DURATION_FACTOR_HV3] = 200,
+                       /* Passive Scan in Dual Antenna Parameters */
+                       [WL18XX_CONF_SG_CONSECUTIVE_HV3_IN_PASSIVE_SCAN] = 0,
+                       [WL18XX_CONF_SG_BEACON_HV3_COLL_TH_IN_PASSIVE_SCAN] = 0,
+                       [WL18XX_CONF_SG_TX_RX_PROTECT_BW_IN_PASSIVE_SCAN] = 0,
+                       /* General Parameters */
+                       [WL18XX_CONF_SG_STA_FORCE_PS_IN_BT_SCO] = 1,
+                       [WL18XX_CONF_SG_PARAM_36] = 0,
+                       [WL18XX_CONF_SG_BEACON_MISS_PERCENT] = 60,
+                       [WL18XX_CONF_SG_PARAM_38] = 0,
+                       [WL18XX_CONF_SG_RXT] = 1200,
+                       [WL18XX_CONF_SG_UNUSED] = 0,
+                       [WL18XX_CONF_SG_ADAPTIVE_RXT_TXT] = 1,
+                       [WL18XX_CONF_SG_GENERAL_USAGE_BIT_MAP] = 3,
+                       [WL18XX_CONF_SG_HV3_MAX_SERVED] = 6,
+                       [WL18XX_CONF_SG_PARAM_44] = 0,
+                       [WL18XX_CONF_SG_PARAM_45] = 0,
+                       [WL18XX_CONF_SG_CONSECUTIVE_CTS_THRESHOLD] = 2,
+                       [WL18XX_CONF_SG_GEMINI_PARAM_47] = 0,
+                       [WL18XX_CONF_SG_STA_CONNECTION_PROTECTION_TIME] = 0,
+                       /* AP Parameters */
+                       [WL18XX_CONF_SG_AP_BEACON_MISS_TX] = 3,
+                       [WL18XX_CONF_SG_PARAM_50] = 0,
+                       [WL18XX_CONF_SG_AP_BEACON_WINDOW_INTERVAL] = 2,
+                       [WL18XX_CONF_SG_AP_CONNECTION_PROTECTION_TIME] = 30,
+                       [WL18XX_CONF_SG_PARAM_53] = 0,
+                       [WL18XX_CONF_SG_PARAM_54] = 0,
+                       /* CTS Diluting Parameters */
+                       [WL18XX_CONF_SG_CTS_DILUTED_BAD_RX_PACKETS_TH] = 0,
+                       [WL18XX_CONF_SG_CTS_CHOP_IN_DUAL_ANT_SCO_MASTER] = 0,
+                       [WL18XX_CONF_SG_TEMP_PARAM_1] = 0,
+                       [WL18XX_CONF_SG_TEMP_PARAM_2] = 0,
+                       [WL18XX_CONF_SG_TEMP_PARAM_3] = 0,
+                       [WL18XX_CONF_SG_TEMP_PARAM_4] = 0,
+                       [WL18XX_CONF_SG_TEMP_PARAM_5] = 0,
+                       [WL18XX_CONF_SG_TEMP_PARAM_6] = 0,
+                       [WL18XX_CONF_SG_TEMP_PARAM_7] = 0,
+                       [WL18XX_CONF_SG_TEMP_PARAM_8] = 0,
+                       [WL18XX_CONF_SG_TEMP_PARAM_9] = 0,
+                       [WL18XX_CONF_SG_TEMP_PARAM_10] = 0,
                },
                .state = CONF_SG_PROTECTIVE,
        },
@@ -1895,6 +1906,7 @@ static int wl18xx_setup(struct wl1271 *wl)
 
        BUILD_BUG_ON(WL18XX_MAX_LINKS > WLCORE_MAX_LINKS);
        BUILD_BUG_ON(WL18XX_MAX_AP_STATIONS > WL18XX_MAX_LINKS);
+       BUILD_BUG_ON(WL18XX_CONF_SG_PARAMS_MAX > WLCORE_CONF_SG_PARAMS_MAX);
 
        wl->rtable = wl18xx_rtable;
        wl->num_tx_desc = WL18XX_NUM_TX_DESCRIPTORS;