diff options
| -rw-r--r-- | Kbuild | 3 | ||||
| -rw-r--r-- | core/mac/inc/ani_global.h | 7 | ||||
| -rw-r--r-- | core/sme/inc/oem_data_api.h | 59 | ||||
| -rw-r--r-- | core/sme/inc/oem_data_internal.h | 51 | ||||
| -rw-r--r-- | core/sme/inc/sme_api.h | 4 | ||||
| -rw-r--r-- | core/sme/inc/sme_inside.h | 4 | ||||
| -rw-r--r-- | core/sme/inc/sme_internal.h | 2 | ||||
| -rw-r--r-- | core/sme/src/common/sme_api.c | 22 | ||||
| -rw-r--r-- | core/sme/src/oem_data/oem_data_api.c | 97 | ||||
| -rw-r--r-- | core/wma/src/wma_features.c | 4 |
10 files changed, 6 insertions, 247 deletions
@@ -592,8 +592,6 @@ SME_CMN_OBJS := $(SME_SRC_DIR)/common/sme_api.o \ $(SME_SRC_DIR)/common/sme_power_save.o \ $(SME_SRC_DIR)/common/sme_trace.o -SME_OEM_DATA_OBJS := $(SME_SRC_DIR)/oem_data/oem_data_api.o - SME_P2P_OBJS = $(SME_SRC_DIR)/p2p/p2p_api.o SME_RRM_OBJS := $(SME_SRC_DIR)/rrm/sme_rrm.o @@ -608,7 +606,6 @@ endif SME_OBJS := $(SME_CMN_OBJS) \ $(SME_CSR_OBJS) \ - $(SME_OEM_DATA_OBJS) \ $(SME_P2P_OBJS) \ $(SME_QOS_OBJS) \ $(SME_RRM_OBJS) \ diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index 9c38bf896e01..3058535da0e9 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -47,10 +47,6 @@ #include "sap_api.h" #include "csr_internal.h" -#ifdef FEATURE_OEM_DATA_SUPPORT -#include "oem_data_internal.h" -#endif - #include "sme_rrm_internal.h" #include "rrm_global.h" #include "p2p_api.h" @@ -930,9 +926,6 @@ typedef struct sAniSirGlobal { tCsrScanStruct scan; tCsrRoamStruct roam; -#ifdef FEATURE_OEM_DATA_SUPPORT - tOemDataStruct oemData; -#endif tRrmContext rrm; #ifdef WLAN_FEATURE_CONCURRENT_P2P tp2pContext p2pContext[MAX_NO_OF_P2P_SESSIONS]; diff --git a/core/sme/inc/oem_data_api.h b/core/sme/inc/oem_data_api.h deleted file mode 100644 index 27b5e23cf467..000000000000 --- a/core/sme/inc/oem_data_api.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * 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. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifdef FEATURE_OEM_DATA_SUPPORT - -/** - * \file oem_data_api.h - * - * Exports and types for the Common OEM DATA REQ/RSP Module interfaces. - */ - -#ifndef __OEM_DATA_API_H__ -#define __OEM_DATA_API_H__ -#include "sir_api.h" -#include "sir_mac_prot_def.h" -#include "csr_link_list.h" - -typedef enum { - eOEM_DATA_REQ_SUCCESS = 1, - eOEM_DATA_REQ_FAILURE, - eOEM_DATA_REQ_INVALID_MODE, -} eOemDataReqStatus; - -QDF_STATUS oem_data_oem_data_req_open(tHalHandle hHal); -QDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal); - -/* - * HDD Callback function for the sme to callback when - * the oem data rsp is available - */ -typedef void (*sme_send_oem_data_rsp_msg)(tSirOemDataRsp *); - -#endif /* _OEM_DATA_API_H__ */ - -#endif /* FEATURE_OEM_DATA_SUPPORT */ diff --git a/core/sme/inc/oem_data_internal.h b/core/sme/inc/oem_data_internal.h deleted file mode 100644 index 1aef7147efe7..000000000000 --- a/core/sme/inc/oem_data_internal.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * 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. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifdef FEATURE_OEM_DATA_SUPPORT - -/** - * - * \file oem_data_internal.h - * - * Exports and types for the Common OEM DATA REQ/RSP Module interfaces. - */ - -#ifndef __OEM_DATA_INTERNAL_H__ -#define __OEM_DATA_INTERNAL_H__ - -#include "csr_support.h" -#include "cds_reg_service.h" -#include "oem_data_api.h" - -typedef struct tagOemDataStruct { - /* callback for sending data response to oem application */ - sme_send_oem_data_rsp_msg oem_data_rsp_callback; -} tOemDataStruct; - -#endif /* __OEM_DATA_INTERNAL_H__ */ - -#endif /* FEATURE_OEM_DATA_SUPPORT */ diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 55f715cc810b..043c3963b9e5 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -48,10 +48,6 @@ #include "sme_internal.h" #include "wma_tgt_cfg.h" -#ifdef FEATURE_OEM_DATA_SUPPORT -#include "oem_data_api.h" -#endif - #include "sme_rrm_internal.h" #include "sir_types.h" /*-------------------------------------------------------------------------- diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index 16d5c47880ed..2b41976446ae 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -47,10 +47,6 @@ #include "sme_qos_api.h" #include "sme_qos_internal.h" -#ifdef FEATURE_OEM_DATA_SUPPORT -#include "oem_data_internal.h" -#endif - #include "sme_rrm_api.h" ePhyChanBondState csr_convert_cb_ini_value_to_phy_cb_state(uint32_t cbIniValue); diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index 4da807a26947..44bb9a7bd5a1 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -153,6 +153,7 @@ typedef void (*preferred_network_found_ind_cb)(void *callback_context, typedef void (*ocb_callback)(void *context, void *response); typedef void (*sme_set_thermal_level_callback)(void *context, u_int8_t level); typedef void (*p2p_lo_callback)(void *context, void *event); +typedef void (*sme_send_oem_data_rsp_msg)(tSirOemDataRsp *); typedef struct tagSmeStruct { eSmeState state; @@ -242,6 +243,7 @@ typedef struct tagSmeStruct { struct sir_bpf_get_offload *); p2p_lo_callback p2p_lo_event_callback; void *p2p_lo_event_context; + sme_send_oem_data_rsp_msg oem_data_rsp_callback; } tSmeStruct, *tpSmeStruct; #endif /* #if !defined( __SMEINTERNAL_H ) */ diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index d02a3c7e2be8..3435930f3dbf 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -1123,15 +1123,6 @@ QDF_STATUS sme_open(tHalHandle hHal) return status; } #endif -#ifdef FEATURE_OEM_DATA_SUPPORT - status = oem_data_oem_data_req_open(pMac); - if (!QDF_IS_STATUS_SUCCESS(status)) { - sms_log(pMac, LOGE, - FL("oem_data_oem_data_req_open, status=%d"), - status); - return status; - } -#endif status = init_sme_cmd_list(pMac); if (!QDF_IS_STATUS_SUCCESS(status)) return status; @@ -3199,15 +3190,6 @@ QDF_STATUS sme_close(tHalHandle hHal) fail_status = status; } #endif -#ifdef FEATURE_OEM_DATA_SUPPORT - status = oem_data_oem_data_req_close(hHal); - if (!QDF_IS_STATUS_SUCCESS(status)) { - sms_log(pMac, LOGE, - "OEM DATA REQ close failed during sme close with status=%d", - status); - fail_status = status; - } -#endif status = sme_ps_close(hHal); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, @@ -4751,7 +4733,7 @@ QDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pmac = PMAC_STRUCT(h_hal); - pmac->oemData.oem_data_rsp_callback = callback; + pmac->sme.oem_data_rsp_callback = callback; return status; @@ -4775,7 +4757,7 @@ void sme_deregister_oem_data_rsp_callback(tHalHandle h_hal) } pmac = PMAC_STRUCT(h_hal); - pmac->oemData.oem_data_rsp_callback = NULL; + pmac->sme.oem_data_rsp_callback = NULL; } #endif diff --git a/core/sme/src/oem_data/oem_data_api.c b/core/sme/src/oem_data/oem_data_api.c deleted file mode 100644 index 71a6bd0ed161..000000000000 --- a/core/sme/src/oem_data/oem_data_api.c +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * 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. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifdef FEATURE_OEM_DATA_SUPPORT -/** ------------------------------------------------------------------------- * - ------------------------------------------------------------------------- * - - \file oem_data_api.c - - Implementation for the OEM DATA REQ/RSP interfaces. - ========================================================================== */ -#include "ani_global.h" -#include "oem_data_api.h" -#include "cds_mq.h" -#include "sme_inside.h" -#include "sms_debug.h" -#include "qdf_util.h" - -#include "csr_support.h" - -#include "host_diag_core_log.h" -#include "host_diag_core_event.h" - -/* --------------------------------------------------------------------------- - \fn oem_data_oem_data_req_open - \brief This function must be called before any API call to (OEM DATA REQ/RSP module) - \return QDF_STATUS - -------------------------------------------------------------------------------*/ - -QDF_STATUS oem_data_oem_data_req_open(tHalHandle hHal) -{ - QDF_STATUS status = QDF_STATUS_SUCCESS; - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - - do { - /* initialize all the variables to null */ - qdf_mem_set(&(pMac->oemData), sizeof(tOemDataStruct), 0); - if (!QDF_IS_STATUS_SUCCESS(status)) { - sms_log(pMac, LOGE, - "oem_data_oem_data_req_open: Cannot allocate memory for the timer function"); - break; - } - } while (0); - - return status; -} - -/* --------------------------------------------------------------------------- - \fn oem_data_oem_data_req_close - \brief This function must be called before closing the csr module - \return QDF_STATUS - -------------------------------------------------------------------------------*/ - -QDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal) -{ - QDF_STATUS status = QDF_STATUS_SUCCESS; - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - - do { - if (!QDF_IS_STATUS_SUCCESS(status)) { - sms_log(pMac, LOGE, - "oem_data_oem_data_req_close: Failed in oem_data_oem_data_req_close at StopTimers"); - break; - } - - /* initialize all the variables to null */ - qdf_mem_set(&(pMac->oemData), sizeof(tOemDataStruct), 0); - - } while (0); - - return QDF_STATUS_SUCCESS; -} -#endif diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index abd8848ee43b..84313da6185a 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -1649,7 +1649,7 @@ int wma_oem_data_response_handler(void *handle, return -EINVAL; } - if (!pmac->oemData.oem_data_rsp_callback) { + if (!pmac->sme.oem_data_rsp_callback) { WMA_LOGE(FL("Callback not registered")); return -EINVAL; } @@ -1698,7 +1698,7 @@ int wma_oem_data_response_handler(void *handle, WMA_LOGI(FL("Sending OEM_DATA_RSP(len: %d) to upper layer"), datalen); - pmac->oemData.oem_data_rsp_callback(oem_rsp); + pmac->sme.oem_data_rsp_callback(oem_rsp); if (oem_rsp->data) qdf_mem_free(oem_rsp->data); |