Bläddra i källkod

qcacld-3.0: Rename the flag QCA_WIFI_NAPIER_EMULATION

To make it generic, rename the flag QCA_WIFI_NAPIER_EMULATION
as QCA_WIFI_EMULATION.

Change-Id: I8e654262a38a7a701a5a34e2bbd5394c8985c65a
CRs-Fixed: 2871313
Aditya Kodukula 4 år sedan
förälder
incheckning
a9f651f6ba

+ 1 - 1
Kbuild

@@ -3275,7 +3275,7 @@ cppflags-$(CONFIG_WLAN_FEATURE_PKT_CAPTURE) += -DWLAN_FEATURE_PKT_CAPTURE
 
 cppflags-$(CONFIG_WLAN_FEATURE_PKT_CAPTURE_V2) += -DWLAN_FEATURE_PKT_CAPTURE_V2
 
-cppflags-$(CONFIG_QCA_WIFI_NAPIER_EMULATION) += -DQCA_WIFI_NAPIER_EMULATION
+cppflags-$(CONFIG_QCA_WIFI_EMULATION) += -DQCA_WIFI_EMULATION
 cppflags-$(CONFIG_SHADOW_V2) += -DCONFIG_SHADOW_V2
 cppflags-$(CONFIG_QCA6290_HEADERS_DEF) += -DQCA6290_HEADERS_DEF
 cppflags-$(CONFIG_QCA_WIFI_QCA6290) += -DQCA_WIFI_QCA6290

+ 2 - 2
components/mlme/dispatcher/inc/cfg_mlme_generic.h

@@ -201,7 +201,7 @@ enum monitor_mode_concurrency {
  *
  * </ini>
  */
-#if defined(QCA_WIFI_NAPIER_EMULATION) || defined(QCA_WIFI_QCA6290)
+#if defined(QCA_WIFI_EMULATION) || defined(QCA_WIFI_QCA6290)
 #define CFG_PREVENT_LINK_DOWN CFG_INI_BOOL( \
 	"gPreventLinkDown", \
 	1, \
@@ -211,7 +211,7 @@ enum monitor_mode_concurrency {
 	"gPreventLinkDown", \
 	0, \
 	"Prevent Bus Link Down")
-#endif /* QCA_WIFI_NAPIER_EMULATION */
+#endif /* QCA_WIFI_EMULATION */
 
 /*
  * <ini>

+ 4 - 4
configs/default_defconfig

@@ -1,6 +1,6 @@
 ifeq ($(CONFIG_CNSS_QCA6290), y)
 	ifeq ($(CONFIG_CNSS_EMULATION), y)
-		CONFIG_QCA_WIFI_NAPIER_EMULATION := y
+		CONFIG_QCA_WIFI_EMULATION := y
 	endif
 	CONFIG_LITHIUM := y
 	CONFIG_QCA6290_11AX := y
@@ -11,7 +11,7 @@ endif
 
 ifeq ($(CONFIG_CNSS_QCA6390), y)
 	ifeq ($(CONFIG_CNSS_EMULATION), y)
-		CONFIG_QCA_WIFI_NAPIER_EMULATION := y
+		CONFIG_QCA_WIFI_EMULATION := y
 	endif
 	CONFIG_LITHIUM := y
 	CONFIG_WLAN_FEATURE_11AX := y
@@ -33,7 +33,7 @@ ifeq ($(CONFIG_CNSS_QCA6490), y)
 	CONFIG_WLAN_CFR_ENABLE := y
 	CONFIG_WLAN_ENH_CFR_ENABLE := y
 	ifeq ($(CONFIG_CNSS_EMULATION), y)
-		CONFIG_QCA_WIFI_NAPIER_EMULATION := y
+		CONFIG_QCA_WIFI_EMULATION := y
 	endif
 	CONFIG_LITHIUM := y
 	CONFIG_WLAN_FEATURE_11AX := y
@@ -52,7 +52,7 @@ endif
 
 ifeq ($(CONFIG_CNSS_QCA6750), y)
 	ifeq ($(CONFIG_CNSS_EMULATION), y)
-		CONFIG_QCA_WIFI_NAPIER_EMULATION := y
+		CONFIG_QCA_WIFI_EMULATION := y
 	endif
 	CONFIG_LITHIUM := y
 	CONFIG_WLAN_FEATURE_11AX := y

+ 2 - 2
core/hdd/inc/hdd_config.h

@@ -128,7 +128,7 @@ enum hdd_dot11_mode {
 			CFG_VALUE_OR_DEFAULT, \
 			"dot11 mode")
 
-#ifdef QCA_WIFI_NAPIER_EMULATION
+#ifdef QCA_WIFI_EMULATION
 #define CFG_INTERFACE_CHANGE_WAIT_DEFAULT	300000
 #else
 #define CFG_INTERFACE_CHANGE_WAIT_DEFAULT	10000
@@ -161,7 +161,7 @@ enum hdd_dot11_mode {
 			CFG_VALUE_OR_DEFAULT, \
 			"Interface change wait")
 
-#ifdef QCA_WIFI_NAPIER_EMULATION
+#ifdef QCA_WIFI_EMULATION
 #define CFG_TIMER_MULTIPLIER_DEFAULT	100
 #else
 #define CFG_TIMER_MULTIPLIER_DEFAULT	1

+ 1 - 1
core/hdd/src/wlan_hdd_main.c

@@ -16172,7 +16172,7 @@ void hdd_deinit(void)
 	cds_deinit();
 }
 
-#ifdef QCA_WIFI_NAPIER_EMULATION
+#ifdef QCA_WIFI_EMULATION
 #define HDD_WLAN_START_WAIT_TIME ((CDS_WMA_TIMEOUT + 5000) * 100)
 #else
 #define HDD_WLAN_START_WAIT_TIME (CDS_WMA_TIMEOUT + 5000)

+ 1 - 1
core/hdd/src/wlan_hdd_power.c

@@ -86,7 +86,7 @@
 #include "wlan_hdd_thermal.h"
 #include "wlan_hdd_object_manager.h"
 /* Preprocessor definitions and constants */
-#ifdef QCA_WIFI_NAPIER_EMULATION
+#ifdef QCA_WIFI_EMULATION
 #define HDD_SSR_BRING_UP_TIME 3000000
 #else
 #define HDD_SSR_BRING_UP_TIME 30000

+ 1 - 1
core/sap/src/sap_fsm.c

@@ -3709,7 +3709,7 @@ static int sap_start_dfs_cac_timer(struct sap_context *sap_ctx)
 	if (0 == cac_dur)
 		return 0;
 
-#ifdef QCA_WIFI_NAPIER_EMULATION
+#ifdef QCA_WIFI_EMULATION
 	cac_dur = cac_dur / 100;
 #endif
 	sap_debug("sapdfs: SAP_DFS_CHANNEL_CAC_START on CH freq %d, CAC_DUR-%d sec",

+ 1 - 1
core/sme/src/csr/csr_api_roam.c

@@ -693,7 +693,7 @@ scan_list_sort_error:
  *
  * Return: QDF_STATUS enumeration
  */
-#ifdef QCA_WIFI_NAPIER_EMULATION
+#ifdef QCA_WIFI_EMULATION
 #define SCAN_CHAN_LIST_5G_LEN 6
 #define SCAN_CHAN_LIST_2G_LEN 3
 static const uint16_t