瀏覽代碼

qcacmn: Move CTL value enums to reg_services_public_struct.h

The objective is to remove qcacld-3.0 redundant macros and
replace them with the converged enums exposed in
reg_services_public_struct.h

Change-Id: I3f106f7f9f8a533b1964d3ea256a2fef5e4bbd4f
CRs-Fixed: 2416532
Srinivas Girigowda 6 年之前
父節點
當前提交
1d5ca92967
共有 2 個文件被更改,包括 20 次插入20 次删除
  1. 0 20
      umac/regulatory/core/src/reg_db.h
  2. 20 0
      umac/regulatory/dispatcher/inc/reg_services_public_struct.h

+ 0 - 20
umac/regulatory/core/src/reg_db.h

@@ -88,26 +88,6 @@ struct reg_domain_pair {
 	uint8_t dmn_id_2g;
 };
 
-/**
- * enum ctl_value - CTL value
- * @CTL_FCC: CTL FCC
- * @CTL_MKK: CTL MKK
- * @CTL_ETSI: CTL ETSI
- * @CTL_KOR: CTL KOR
- * @CTL_CHN: CTL CHINA
- * @CTL_USER_DEF: CTL USER_DEF
- * @CTL_NONE: CTL NONE
- */
-enum ctl_value {
-	CTL_FCC = 0x10,
-	CTL_ETSI = 0x30,
-	CTL_MKK = 0x40,
-	CTL_KOR = 0x50,
-	CTL_CHN = 0x60,
-	CTL_USER_DEF = 0x70,
-	CTL_NONE = 0xff
-};
-
 QDF_STATUS reg_get_num_countries(int *num_countries);
 
 QDF_STATUS reg_get_num_reg_dmn_pairs(int *num_reg_dmn);

+ 20 - 0
umac/regulatory/dispatcher/inc/reg_services_public_struct.h

@@ -548,6 +548,26 @@ typedef enum {
 	REGDOMAIN_COUNT
 } v_REGDOMAIN_t;
 
+/**
+ * enum ctl_value - CTL value
+ * @CTL_FCC: CTL FCC
+ * @CTL_MKK: CTL MKK
+ * @CTL_ETSI: CTL ETSI
+ * @CTL_KOR: CTL KOR
+ * @CTL_CHN: CTL CHINA
+ * @CTL_USER_DEF: CTL USER_DEF
+ * @CTL_NONE: CTL NONE
+ */
+enum ctl_value {
+	CTL_FCC = 0x10,
+	CTL_ETSI = 0x30,
+	CTL_MKK = 0x40,
+	CTL_KOR = 0x50,
+	CTL_CHN = 0x60,
+	CTL_USER_DEF = 0x70,
+	CTL_NONE = 0xff
+};
+
 /**
  * struct ch_params
  * @ch_width: channel width