qcacld-3.0: Use converged qcacmn macros (part 2)

Replace the existing qcacld-3.0 macros with qcacmn converged
macros.

Change-Id: I8c7e07587111bc3b783138623249da692168d9d3
CRs-Fixed: 2416429

core/cds/inc/cds_regdomain.h

@@ -440,20 +440,6 @@ enum reg_domain {
 
 };
 
-/**
- * enum ctl_val: CTL value
- * @FCC: FCC
- * @MKK: MKK
- * @ETSI: ETSI
- * @NO_CTL: no CTL
- */
-enum ctl_val {
-	FCC = 0x10,
-	MKK = 0x40,
-	ETSI = 0x30,
-	NO_CTL = 0xff
-};
-
 /**
  * struct reg_dmn_pair: regulatory domain pair
  * @reg_dmn_pair: reg domain pair

core/cds/src/cds_regdomain.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011,2013-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011,2013-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -301,70 +301,70 @@ static const struct country_code_to_reg_dmn g_all_countries[] = {
 };
 
 static const struct reg_dmn g_reg_dmns[] = {
-	{FCC1, FCC},
-	{FCC2, FCC},
-	{FCC3, FCC},
-	{FCC4, FCC},
-	{FCC5, FCC},
-	{FCC6, FCC},
-	{FCC7, FCC},
-	{FCC8, FCC},
-	{FCC9, FCC},
-	{FCC10, FCC},
-	{FCC11, FCC},
-	{FCC13, FCC},
-	{FCC14, FCC},
-	{ETSI1, ETSI},
-	{ETSI2, ETSI},
-	{ETSI3, ETSI},
-	{ETSI4, ETSI},
-	{ETSI5, ETSI},
-	{ETSI6, ETSI},
-	{ETSI8, ETSI},
-	{ETSI9, ETSI},
-	{ETSI10, ETSI},
-	{ETSI11, ETSI},
-	{APL1, ETSI},
-	{APL2, ETSI},
-	{APL3, ETSI},
-	{APL4, ETSI},
-	{APL5, ETSI},
-	{APL6, ETSI},
-	{APL7, ETSI},
-	{APL8, ETSI},
-	{APL9, ETSI},
-	{APL10, ETSI},
-	{APL11, ETSI},
-	{APL12, ETSI},
-	{APL13, ETSI},
-	{APL14, FCC},
-	{APL15, FCC},
-	{APL16, FCC},
-	{APL17, FCC},
-	{APL20, ETSI},
-	{APL23, ETSI},
-	{NULL1, NO_CTL},
-	{MKK3, MKK},
-	{MKK5, MKK},
-	{MKK11, MKK},
-	{WORLD, ETSI},
-	{FCCA, FCC},
-	{MKKA, MKK},
-	{MKKC, MKK},
-	{ETSIC, ETSI},
-	{WOR0_WORLD, NO_CTL},
-	{WOR1_WORLD, NO_CTL},
-	{WOR2_WORLD, NO_CTL},
-	{WOR3_WORLD, NO_CTL},
-	{WOR4_FCCA, NO_CTL},
-	{WOR5_ETSIC, NO_CTL},
-	{WOR01_WORLD, NO_CTL},
-	{WOR02_WORLD, NO_CTL},
-	{EU1_WORLD, NO_CTL},
-	{WOR9_WORLD, NO_CTL},
-	{WORA_WORLD, NO_CTL},
-	{WORB_WORLD, NO_CTL},
-	{WORC_WORLD, NO_CTL},
+	{FCC1, CTL_FCC},
+	{FCC2, CTL_FCC},
+	{FCC3, CTL_FCC},
+	{FCC4, CTL_FCC},
+	{FCC5, CTL_FCC},
+	{FCC6, CTL_FCC},
+	{FCC7, CTL_FCC},
+	{FCC8, CTL_FCC},
+	{FCC9, CTL_FCC},
+	{FCC10, CTL_FCC},
+	{FCC11, CTL_FCC},
+	{FCC13, CTL_FCC},
+	{FCC14, CTL_FCC},
+	{ETSI1, CTL_ETSI},
+	{ETSI2, CTL_ETSI},
+	{ETSI3, CTL_ETSI},
+	{ETSI4, CTL_ETSI},
+	{ETSI5, CTL_ETSI},
+	{ETSI6, CTL_ETSI},
+	{ETSI8, CTL_ETSI},
+	{ETSI9, CTL_ETSI},
+	{ETSI10, CTL_ETSI},
+	{ETSI11, CTL_ETSI},
+	{APL1, CTL_ETSI},
+	{APL2, CTL_ETSI},
+	{APL3, CTL_ETSI},
+	{APL4, CTL_ETSI},
+	{APL5, CTL_ETSI},
+	{APL6, CTL_ETSI},
+	{APL7, CTL_ETSI},
+	{APL8, CTL_ETSI},
+	{APL9, CTL_ETSI},
+	{APL10, CTL_ETSI},
+	{APL11, CTL_ETSI},
+	{APL12, CTL_ETSI},
+	{APL13, CTL_ETSI},
+	{APL14, CTL_FCC},
+	{APL15, CTL_FCC},
+	{APL16, CTL_FCC},
+	{APL17, CTL_FCC},
+	{APL20, CTL_ETSI},
+	{APL23, CTL_ETSI},
+	{NULL1, CTL_NONE},
+	{MKK3, CTL_MKK},
+	{MKK5, CTL_MKK},
+	{MKK11, CTL_MKK},
+	{WORLD, CTL_ETSI},
+	{FCCA, CTL_FCC},
+	{MKKA, CTL_MKK},
+	{MKKC, CTL_MKK},
+	{ETSIC, CTL_ETSI},
+	{WOR0_WORLD, CTL_NONE},
+	{WOR1_WORLD, CTL_NONE},
+	{WOR2_WORLD, CTL_NONE},
+	{WOR3_WORLD, CTL_NONE},
+	{WOR4_FCCA, CTL_NONE},
+	{WOR5_ETSIC, CTL_NONE},
+	{WOR01_WORLD, CTL_NONE},
+	{WOR02_WORLD, CTL_NONE},
+	{EU1_WORLD, CTL_NONE},
+	{WOR9_WORLD, CTL_NONE},
+	{WORA_WORLD, CTL_NONE},
+	{WORB_WORLD, CTL_NONE},
+	{WORC_WORLD, CTL_NONE},
 };
 
 

core/wma/inc/wma_internal.h

@@ -53,11 +53,6 @@
 #define WMA_LINK_MONITOR_DEFAULT_TIME_SECS 10
 #define WMA_KEEP_ALIVE_DEFAULT_TIME_SECS   5
 
-/* conformance test limits */
-#define FCC       0x10
-#define MKK       0x40
-#define ETSI      0x30
-
 /* The maximum number of patterns that can be transmitted by the firmware
  *  and maximum patterns size.
  */