Fix the conflicts of cfg.txt autogenerated files
The commit "Disable LDPC in sta mode when AP is TXBF capable"
overwrites the defines in header files.correct the defines
in the autogenerated header files
Change-Id: Ibbc2c1a699c3eaf01ded04ce614328931f7fdf3a
diff --git a/CORE/MAC/inc/wniCfgAp.h b/CORE/MAC/inc/wniCfgAp.h
index 6f3654a..b71c2b7 100644
--- a/CORE/MAC/inc/wniCfgAp.h
+++ b/CORE/MAC/inc/wniCfgAp.h
@@ -354,9 +354,10 @@
#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 289
#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 290
#define WNI_CFG_ENABLE_MC_ADDR_LIST 291
-#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 292
-#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED 293
-#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP 294
+#define WNI_CFG_ENABLE_UC_FILTER 292
+#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 293
+#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED 294
+#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP 295
/*
* String parameter lengths
@@ -1838,11 +1839,11 @@
#define WNI_CFG_NUM_BUFF_ADVERT_STAMIN 0
#define WNI_CFG_NUM_BUFF_ADVERT_STAMAX 128
-#define WNI_CFG_NUM_BUFF_ADVERT_STADEF 45
+#define WNI_CFG_NUM_BUFF_ADVERT_STADEF 64
#define WNI_CFG_NUM_BUFF_ADVERT_APMIN 0
#define WNI_CFG_NUM_BUFF_ADVERT_APMAX 128
-#define WNI_CFG_NUM_BUFF_ADVERT_APDEF 45
+#define WNI_CFG_NUM_BUFF_ADVERT_APDEF 64
#define WNI_CFG_MAX_RX_AMPDU_FACTOR_STAMIN 0
#define WNI_CFG_MAX_RX_AMPDU_FACTOR_STAMAX 3
@@ -2435,6 +2436,14 @@
#define WNI_CFG_ENABLE_MC_ADDR_LIST_APMAX 1
#define WNI_CFG_ENABLE_MC_ADDR_LIST_APDEF 0
+#define WNI_CFG_ENABLE_UC_FILTER_STAMIN 0
+#define WNI_CFG_ENABLE_UC_FILTER_STAMAX 1
+#define WNI_CFG_ENABLE_UC_FILTER_STADEF 0
+
+#define WNI_CFG_ENABLE_UC_FILTER_APMIN 0
+#define WNI_CFG_ENABLE_UC_FILTER_APMAX 1
+#define WNI_CFG_ENABLE_UC_FILTER_APDEF 0
+
#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMIN 0
#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMAX 1
#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STADEF 0
@@ -2459,10 +2468,10 @@
#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_APMAX 1
#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_APDEF 0
-#define CFG_PARAM_MAX_NUM 295
-#define CFG_AP_IBUF_MAX_SIZE 234
+#define CFG_PARAM_MAX_NUM 296
+#define CFG_AP_IBUF_MAX_SIZE 235
#define CFG_AP_SBUF_MAX_SIZE 3422
-#define CFG_STA_IBUF_MAX_SIZE 229
+#define CFG_STA_IBUF_MAX_SIZE 230
#define CFG_STA_SBUF_MAX_SIZE 3388
#define CFG_SEM_MAX_NUM 19
diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h
index 3e7fa52..42b4991 100644
--- a/CORE/MAC/inc/wniCfgSta.h
+++ b/CORE/MAC/inc/wniCfgSta.h
@@ -348,9 +348,10 @@
#define WNI_CFG_AP_KEEP_ALIVE_TIMEOUT 289
#define WNI_CFG_GO_KEEP_ALIVE_TIMEOUT 290
#define WNI_CFG_ENABLE_MC_ADDR_LIST 291
-#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 292
-#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED 293
-#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP 294
+#define WNI_CFG_ENABLE_UC_FILTER 292
+#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION 293
+#define WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED 294
+#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP 295
/*
* String parameter lengths
@@ -1255,7 +1256,7 @@
#define WNI_CFG_NUM_BUFF_ADVERT_STAMIN 0
#define WNI_CFG_NUM_BUFF_ADVERT_STAMAX 128
-#define WNI_CFG_NUM_BUFF_ADVERT_STADEF 45
+#define WNI_CFG_NUM_BUFF_ADVERT_STADEF 64
#define WNI_CFG_MAX_RX_AMPDU_FACTOR_STAMIN 0
#define WNI_CFG_MAX_RX_AMPDU_FACTOR_STAMAX 3
@@ -1588,6 +1589,10 @@
#define WNI_CFG_ENABLE_MC_ADDR_LIST_STAMAX 1
#define WNI_CFG_ENABLE_MC_ADDR_LIST_STADEF 0
+#define WNI_CFG_ENABLE_UC_FILTER_STAMIN 0
+#define WNI_CFG_ENABLE_UC_FILTER_STAMAX 1
+#define WNI_CFG_ENABLE_UC_FILTER_STADEF 0
+
#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMIN 0
#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STAMAX 1
#define WNI_CFG_ENABLE_LPWR_IMG_TRANSITION_STADEF 0
@@ -1600,8 +1605,8 @@
#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STAMAX 1
#define WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP_STADEF 0
-#define CFG_PARAM_MAX_NUM 295
-#define CFG_STA_IBUF_MAX_SIZE 229
+#define CFG_PARAM_MAX_NUM 296
+#define CFG_STA_IBUF_MAX_SIZE 230
#define CFG_STA_SBUF_MAX_SIZE 3388
#define CFG_SEM_MAX_NUM 19
diff --git a/CORE/MAC/src/cfg/cfgParamName.c b/CORE/MAC/src/cfg/cfgParamName.c
index 66282dd..c903a3b 100644
--- a/CORE/MAC/src/cfg/cfgParamName.c
+++ b/CORE/MAC/src/cfg/cfgParamName.c
@@ -345,6 +345,7 @@
(unsigned char *)"AP_KEEP_ALIVE_TIMEOUT",
(unsigned char *)"GO_KEEP_ALIVE_TIMEOUT",
(unsigned char *)"ENABLE_MC_ADDR_LIST",
+ (unsigned char *)"ENABLE_UC_FILTER",
(unsigned char *)"ENABLE_LPWR_IMG_TRANSITION",
(unsigned char *)"ENABLE_MCC_ADAPTIVE_SCHED",
(unsigned char *)"DISABLE_LDPC_WITH_TXBF_AP",
diff --git a/firmware_bin/WCNSS_cfg.dat b/firmware_bin/WCNSS_cfg.dat
index ce42bc0..4308e99 100644
--- a/firmware_bin/WCNSS_cfg.dat
+++ b/firmware_bin/WCNSS_cfg.dat
Binary files differ
diff --git a/pronto/firmware_bin/WCNSS_cfg.dat b/pronto/firmware_bin/WCNSS_cfg.dat
new file mode 100644
index 0000000..4308e99
--- /dev/null
+++ b/pronto/firmware_bin/WCNSS_cfg.dat
Binary files differ