From 1d5ca9296745452e63737beffdb39528458cae1f Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 14 Mar 2019 15:06:08 -0700 Subject: [PATCH] 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 --- umac/regulatory/core/src/reg_db.h | 20 ------------------- .../inc/reg_services_public_struct.h | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/umac/regulatory/core/src/reg_db.h b/umac/regulatory/core/src/reg_db.h index fbbc6335c6b3..9ec619865019 100644 --- a/umac/regulatory/core/src/reg_db.h +++ b/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); diff --git a/umac/regulatory/dispatcher/inc/reg_services_public_struct.h b/umac/regulatory/dispatcher/inc/reg_services_public_struct.h index 76a79dea3f72..cd95198935f1 100644 --- a/umac/regulatory/dispatcher/inc/reg_services_public_struct.h +++ b/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