diff --git a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h index 108b169ab384..8a6212647a12 100644 --- a/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h +++ b/components/mlme/dispatcher/inc/wlan_mlme_public_struct.h @@ -56,6 +56,7 @@ #define CFG_MAX_TX_POWER_2_4_LEN 128 #define CFG_MAX_TX_POWER_5_LEN 128 #define CFG_POWER_USAGE_MAX_LEN 4 +#define CFG_MAX_STR_LEN 256 #define CFG_VALID_CHANNEL_LIST_STRING_LEN (CFG_VALID_CHANNEL_LIST_LEN * 4) /** diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index 3b352ee4cfe3..f4b65aa6701e 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -27,7 +27,6 @@ #include "lim_global.h" #include "sch_global.h" #include "sys_global.h" -#include "cfg_global.h" #include "sir_api.h" #include "csr_api.h" @@ -751,7 +750,6 @@ struct mgmt_beacon_probe_filter { struct mac_context { enum qdf_driver_type gDriverType; struct wlan_mlme_chain_cfg fw_chain_cfg; - tAniSirCfg cfg; struct wlan_mlme_cfg *mlme_cfg; tAniSirLim lim; struct sch_context sch; diff --git a/core/mac/src/include/cfg_api.h b/core/mac/src/include/cfg_api.h deleted file mode 100644 index 234df1aef8b9..000000000000 --- a/core/mac/src/include/cfg_api.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2011-2012, 2015-2018 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 - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * - * Author: Kevin Nguyen - * Date: 04/09/02 - * History:- - * 04/09/02 Created. - * -------------------------------------------------------------------- - * - */ - -#ifndef __CFGAPI_H -#define __CFGAPI_H - -#include -#include -#include -#include -#include - -/*---------------------------------------------------------------------*/ -/* CFG definitions */ -/*---------------------------------------------------------------------*/ - -/* CFG status */ -typedef enum eCfgStatusTypes { - CFG_INCOMPLETE, - CFG_SUCCESS, - CFG_FAILURE -} tCfgStatusTypes; - -/* WEP key mapping table row structure */ -typedef struct { - uint8_t keyMappingAddr[QDF_MAC_ADDR_SIZE]; - uint32_t wepOn; - uint8_t key[SIR_MAC_KEY_LENGTH]; - uint32_t status; -} tCfgWepKeyEntry; - -/*---------------------------------------------------------------------*/ -/* CFG function prototypes */ -/*---------------------------------------------------------------------*/ - -uint32_t cfg_need_restart(struct mac_context *mac, uint16_t cfgId); -uint32_t cfg_need_reload(struct mac_context *mac, uint16_t cfgId); - -/* / Process host message */ -void cfg_process_mb_msg(struct mac_context *, tSirMbMsg *); - -/* / Set integer parameter value */ -QDF_STATUS cfg_set_int(struct mac_context *, uint16_t, uint32_t); - -/* / Check if the parameter is valid */ -QDF_STATUS cfg_check_valid(struct mac_context *, uint16_t, uint32_t *); - -/* / Get integer parameter value */ -QDF_STATUS wlan_cfg_get_int(struct mac_context *, uint16_t, uint32_t *); - -/* / Set string parameter value */ -QDF_STATUS cfg_set_str(struct mac_context *, uint16_t, uint8_t *, uint32_t); - -QDF_STATUS cfg_set_str_notify(struct mac_context *, uint16_t, uint8_t *, uint32_t, - int); - -/* Cfg Download function for Prima or Integrated solutions. */ -void process_cfg_download_req(struct mac_context *); - -/* / Get string parameter value */ -QDF_STATUS wlan_cfg_get_str(struct mac_context *, uint16_t, uint8_t *, uint32_t *); - -/* / Get string parameter maximum length */ -QDF_STATUS wlan_cfg_get_str_max_len(struct mac_context *, uint16_t, uint32_t *); - -/* / Get string parameter maximum length */ -QDF_STATUS wlan_cfg_get_str_len(struct mac_context *, uint16_t, uint32_t *); - -/* / Get the regulatory tx power on given channel */ -int8_t cfg_get_regulatory_max_transmit_power(struct mac_context *mac, - uint8_t channel); - -/* / Get capability info */ -QDF_STATUS cfg_get_capability_info(struct mac_context *mac, uint16_t *pCap, - struct pe_session *pe_session); - -/* / Set capability info */ -void cfg_set_capability_info(struct mac_context *, uint16_t); - -/* / Cleanup CFG module */ -void cfg_cleanup(struct mac_context *mac); - -const char *cfg_get_string(uint16_t cfg_id); - -#endif /* __CFGAPI_H */ diff --git a/core/mac/src/include/cfg_global.h b/core/mac/src/include/cfg_global.h deleted file mode 100644 index ebc4f17c0b2f..000000000000 --- a/core/mac/src/include/cfg_global.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2011-2018 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 - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * - * Author: Sandesh Goel - * Date: 02/09/03 - * History:- - * 04/09/02 Created. - * -------------------------------------------------------------------- - * - */ - -#ifndef __CFGGLOBAL_H -#define __CFGGLOBAL_H - -#include "sir_common.h" -#include "sir_types.h" -#include "wni_cfg.h" - -#define CFG_MAX_NUM_STA SIR_MAX_NUM_STA_IN_IBSS - -#define CFG_MAX_STATIC_STRING 70 -/* as the number of channels grows, 128 is not big enough */ -#define CFG_MAX_STR_LEN 256 - -/*--------------------------------------------------------------------*/ -/* Configuration Control Structure */ -/*--------------------------------------------------------------------*/ -typedef struct { - uint32_t control; -} tCfgCtl; - - -typedef struct sAniSirCfgStaticString { - uint16_t cfgId; - uint8_t maxLen; - uint8_t length; - uint8_t data[255]; -} cfgstatic_string; - -typedef struct sAniSirCfgStatic { - uint16_t cfgId; - uint32_t control; - uint32_t cfgIMin; - uint32_t cfgIMax; - uint32_t cfgIVal; - void *pStrData; -} cgstatic; - -typedef struct sAniSirCfg { - /* CFG module status */ - uint8_t gCfgStatus; - uint16_t gCfgMaxIBufSize; - uint16_t gCfgMaxSBufSize; - - tCfgCtl *gCfgEntry; - - uint8_t *gCfgSBuf; - uint32_t *gCfgIBuf; - uint32_t *gCfgIBufMin; - uint32_t *gCfgIBufMax; - - /* Static buffer for string parameter (must be word-aligned) */ - uint8_t *gSBuffer; - - /* Message param list buffer (enough for largest possible response) */ - uint32_t *gParamList; -} tAniSirCfg, *tpAniSirCfg; - -#endif diff --git a/core/mac/src/include/parser_api.h b/core/mac/src/include/parser_api.h index 77b709f2ed10..82424520ba03 100644 --- a/core/mac/src/include/parser_api.h +++ b/core/mac/src/include/parser_api.h @@ -584,40 +584,6 @@ struct s_ext_cap { uint8_t twt_responder_support:1; }; -#define CFG_GET_INT(nStatus, mac, nItem, cfg) do { \ - (nStatus) = wlan_cfg_get_int((mac), (nItem), &(cfg)); \ - if (QDF_STATUS_SUCCESS != (nStatus)) { \ - pe_err("Failed to retrieve nItem from CFG status: %d", (nStatus)); \ - return nStatus; \ - } \ -} while (0) - -#define CFG_GET_INT_NO_STATUS(nStatus, mac, nItem, cfg) do { \ - (nStatus) = wlan_cfg_get_int((mac), (nItem), &(cfg)); \ - if (QDF_STATUS_SUCCESS != (nStatus)) { \ - pe_err("Failed to retrieve nItem from CFG status: %d", (nStatus)); \ - return; \ - } \ -} while (0) - -#define CFG_GET_STR(nStatus, mac, nItem, cfg, nCfg, nMaxCfg) do { \ - (nCfg) = (nMaxCfg); \ - (nStatus) = wlan_cfg_get_str((mac), (nItem), (cfg), &(nCfg)); \ - if (QDF_STATUS_SUCCESS != (nStatus)) { \ - pe_err("Failed to retrieve nItem from CFG status: %d", (nStatus)); \ - return nStatus; \ - } \ -} while (0) - -#define CFG_GET_STR_NO_STATUS(nStatus, mac, nItem, cfg, nCfg, nMaxCfg) do { \ - (nCfg) = (nMaxCfg); \ - (nStatus) = wlan_cfg_get_str((mac), (nItem), (cfg), &(nCfg)); \ - if (QDF_STATUS_SUCCESS != (nStatus)) { \ - pe_err("Failed to retrieve nItem from CFG status: %d", (nStatus)); \ - return; \ - } \ -} while (0) - void swap_bit_field16(uint16_t in, uint16_t *out); /* Currently implemented as "shims" between callers & the new framesc- */