From 6aded3fc946203859f5b789da0b7eaae64b04bed Mon Sep 17 00:00:00 2001 From: Jianmin Zhu Date: Thu, 5 Dec 2019 10:34:35 +0800 Subject: [PATCH] qcacmn: Redefine channel frequency MACRO as public Move MACRO definition of TWOG_CHAN_6_IN_MHZ out of ifdef CONFIG_CHAN_FREQ_API, move to public header file, then other components can use it. Change-Id: Ieb4b2b167c664246d39949ad4f8d53eda6b9d7de CRs-Fixed: 2580207 --- umac/regulatory/core/src/reg_services_common.h | 7 ------- .../dispatcher/inc/reg_services_public_struct.h | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/umac/regulatory/core/src/reg_services_common.h b/umac/regulatory/core/src/reg_services_common.h index 71e5c65d13..56503315d3 100644 --- a/umac/regulatory/core/src/reg_services_common.h +++ b/umac/regulatory/core/src/reg_services_common.h @@ -51,13 +51,6 @@ ((freq) <= REG_MAX_24GHZ_CH_FREQ)) #ifdef CONFIG_CHAN_FREQ_API -#define FIVEG_STARTING_FREQ 5000 -#define TWOG_STARTING_FREQ 2407 -#define TWOG_CHAN_14_IN_MHZ 2484 -#define TWOG_CHAN_1_IN_MHZ 2412 -#define TWOG_CHAN_5_IN_MHZ 2432 -#define TWOG_CHAN_6_IN_MHZ 2437 -#define TWOG_CHAN_13_IN_MHZ 2472 #define REG_MIN_5GHZ_CH_FREQ channel_map[MIN_5GHZ_CHANNEL].center_freq #define REG_MAX_5GHZ_CH_FREQ channel_map[MAX_5GHZ_CHANNEL].center_freq #endif /* CONFIG_CHAN_FREQ_API */ diff --git a/umac/regulatory/dispatcher/inc/reg_services_public_struct.h b/umac/regulatory/dispatcher/inc/reg_services_public_struct.h index 6fb14b8df2..979f173b23 100644 --- a/umac/regulatory/dispatcher/inc/reg_services_public_struct.h +++ b/umac/regulatory/dispatcher/inc/reg_services_public_struct.h @@ -1062,4 +1062,12 @@ struct avoid_freq_ind_data { struct unsafe_ch_list chan_list; }; +#define FIVEG_STARTING_FREQ 5000 +#define TWOG_STARTING_FREQ 2407 +#define TWOG_CHAN_14_IN_MHZ 2484 +#define TWOG_CHAN_1_IN_MHZ 2412 +#define TWOG_CHAN_5_IN_MHZ 2432 +#define TWOG_CHAN_6_IN_MHZ 2437 +#define TWOG_CHAN_13_IN_MHZ 2472 + #endif