From ab488610071a991df7b11c077a3ce93744ed3f04 Mon Sep 17 00:00:00 2001 From: Tushnim Bhattacharyya Date: Tue, 14 Mar 2017 14:43:24 -0700 Subject: [PATCH] qcacmn: Move PCL weight macros to api header file Move PCL weight macros to API header file. Change-Id: I3183dd8301cd971475d492791df89cd77af2943f CRs-Fixed: 2009818 --- inc/wlan_policy_mgr_public_struct.h | 27 +++++++++++++++++++++++++++ src/wlan_policy_mgr_i.h | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/inc/wlan_policy_mgr_public_struct.h b/inc/wlan_policy_mgr_public_struct.h index 46781b545bd1..9bd892f7d186 100644 --- a/inc/wlan_policy_mgr_public_struct.h +++ b/inc/wlan_policy_mgr_public_struct.h @@ -39,6 +39,33 @@ #define POLICY_MGR_MAX_CHANNEL_LIST 128 +/** + * Some max value greater than the max length of the channel list + */ +#define MAX_WEIGHT_OF_PCL_CHANNELS 255 +/** + * Some fixed weight difference between the groups + */ +#define PCL_GROUPS_WEIGHT_DIFFERENCE 20 + +/** + * Currently max, only 3 groups are possible as per 'enum policy_mgr_pcl_type'. + * i.e., in a PCL only 3 groups of channels can be present + * e.g., SCC channel on 2.4 Ghz, SCC channel on 5 Ghz & 5 Ghz channels. + * Group 1 has highest priority, group 2 has the next higher priority + * and so on. + */ +#define WEIGHT_OF_GROUP1_PCL_CHANNELS MAX_WEIGHT_OF_PCL_CHANNELS +#define WEIGHT_OF_GROUP2_PCL_CHANNELS \ + (WEIGHT_OF_GROUP1_PCL_CHANNELS - PCL_GROUPS_WEIGHT_DIFFERENCE) +#define WEIGHT_OF_GROUP3_PCL_CHANNELS \ + (WEIGHT_OF_GROUP2_PCL_CHANNELS - PCL_GROUPS_WEIGHT_DIFFERENCE) +#define WEIGHT_OF_GROUP4_PCL_CHANNELS \ + (WEIGHT_OF_GROUP3_PCL_CHANNELS - PCL_GROUPS_WEIGHT_DIFFERENCE) + +#define WEIGHT_OF_NON_PCL_CHANNELS 1 +#define WEIGHT_OF_DISALLOWED_CHANNELS 0 + /** * enum hw_mode_ss_config - Possible spatial stream configuration * @HW_MODE_SS_0x0: Unused Tx and Rx of MAC diff --git a/src/wlan_policy_mgr_i.h b/src/wlan_policy_mgr_i.h index 0787042f2ed3..591678859531 100644 --- a/src/wlan_policy_mgr_i.h +++ b/src/wlan_policy_mgr_i.h @@ -67,33 +67,6 @@ extern enum cds_band_type cds_chan_to_band(uint32_t chan); #define CONNECTION_UPDATE_TIMEOUT 1000 #endif -/** - * Some max value greater than the max length of the channel list - */ -#define MAX_WEIGHT_OF_PCL_CHANNELS 255 -/** - * Some fixed weight difference between the groups - */ -#define PCL_GROUPS_WEIGHT_DIFFERENCE 20 - -/** - * Currently max, only 3 groups are possible as per 'enum policy_mgr_pcl_type'. - * i.e., in a PCL only 3 groups of channels can be present - * e.g., SCC channel on 2.4 Ghz, SCC channel on 5 Ghz & 5 Ghz channels. - * Group 1 has highest priority, group 2 has the next higher priority - * and so on. - */ -#define WEIGHT_OF_GROUP1_PCL_CHANNELS MAX_WEIGHT_OF_PCL_CHANNELS -#define WEIGHT_OF_GROUP2_PCL_CHANNELS \ - (WEIGHT_OF_GROUP1_PCL_CHANNELS - PCL_GROUPS_WEIGHT_DIFFERENCE) -#define WEIGHT_OF_GROUP3_PCL_CHANNELS \ - (WEIGHT_OF_GROUP2_PCL_CHANNELS - PCL_GROUPS_WEIGHT_DIFFERENCE) -#define WEIGHT_OF_GROUP4_PCL_CHANNELS \ - (WEIGHT_OF_GROUP3_PCL_CHANNELS - PCL_GROUPS_WEIGHT_DIFFERENCE) - -#define WEIGHT_OF_NON_PCL_CHANNELS 1 -#define WEIGHT_OF_DISALLOWED_CHANNELS 0 - /** * Policy Mgr hardware mode list bit-mask definitions. * Bits 4:0, 31:29 are unused.