qcacmn: Remove redundant header file inclusion from wmi layer
Remove redundant header file inclusion from wmi layer by abstracting the dependency with in WMI layer. Change-Id: Ie113b69006a960b70d781134775bc44c7508fc4c CRs-Fixed: 2023825
This commit is contained in:
@@ -34,7 +34,6 @@
|
||||
#define _WMI_UNIFIED_API_H_
|
||||
|
||||
#include <osdep.h>
|
||||
#include "a_types.h"
|
||||
#ifdef CONFIG_MCL
|
||||
#include "wmi.h"
|
||||
#endif
|
||||
|
@@ -32,9 +32,12 @@
|
||||
#ifndef _WMI_UNIFIED_PRIV_H_
|
||||
#define _WMI_UNIFIED_PRIV_H_
|
||||
#include <osdep.h>
|
||||
#include "a_types.h"
|
||||
#include "wmi_unified_api.h"
|
||||
#include "wmi_unified_param.h"
|
||||
#include "wlan_scan_ucfg_api.h"
|
||||
#ifdef CONFIG_MCL
|
||||
#include <wmi_unified.h>
|
||||
#endif
|
||||
#include "qdf_atomic.h"
|
||||
#include "wlan_objmgr_psoc_service_ready_api.h"
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2013-2014, 2016-2017 The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
||||
*
|
||||
@@ -29,7 +29,6 @@
|
||||
* LMAC offload interface functions for WMI TLV Interface
|
||||
*/
|
||||
|
||||
#include "ol_if_athvar.h"
|
||||
#include <qdf_mem.h> /* qdf_mem_malloc,free, etc. */
|
||||
#include <osdep.h>
|
||||
#include "htc_api.h"
|
||||
|
@@ -28,16 +28,9 @@
|
||||
/*
|
||||
* Host WMI unified implementation
|
||||
*/
|
||||
#include "athdefs.h"
|
||||
#include "osapi_linux.h"
|
||||
#include "a_types.h"
|
||||
#include "a_debug.h"
|
||||
#include "ol_if_athvar.h"
|
||||
#include "htc_api.h"
|
||||
#include "htc_api.h"
|
||||
#include "dbglog_host.h"
|
||||
#include "wmi_unified_priv.h"
|
||||
#include "wmi_unified_param.h"
|
||||
|
||||
#ifndef WMI_NON_TLV_SUPPORT
|
||||
#include "wmi_tlv_helper.h"
|
||||
@@ -1875,11 +1868,6 @@ static uint8_t *wmi_id_to_name(uint32_t wmi_command)
|
||||
return "Invalid WMI cmd";
|
||||
}
|
||||
|
||||
static inline void wma_log_cmd_id(uint32_t cmd_id, uint32_t tag)
|
||||
{
|
||||
WMI_LOGD("Send WMI command:%s command_id:%d htc_tag:%d\n",
|
||||
wmi_id_to_name(cmd_id), cmd_id, tag);
|
||||
}
|
||||
#else
|
||||
static uint8_t *wmi_id_to_name(uint32_t wmi_command)
|
||||
{
|
||||
@@ -1888,6 +1876,12 @@ static uint8_t *wmi_id_to_name(uint32_t wmi_command)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MCL
|
||||
static inline void wmi_log_cmd_id(uint32_t cmd_id, uint32_t tag)
|
||||
{
|
||||
WMI_LOGD("Send WMI command:%s command_id:%d htc_tag:%d\n",
|
||||
wmi_id_to_name(cmd_id), cmd_id, tag);
|
||||
}
|
||||
|
||||
/**
|
||||
* wmi_is_pm_resume_cmd() - check if a cmd is part of the resume sequence
|
||||
* @cmd_id: command to check
|
||||
@@ -2001,7 +1995,7 @@ QDF_STATUS wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf,
|
||||
|
||||
SET_HTC_PACKET_NET_BUF_CONTEXT(pkt, buf);
|
||||
#ifdef CONFIG_MCL
|
||||
wma_log_cmd_id(cmd_id, htc_tag);
|
||||
wmi_log_cmd_id(cmd_id, htc_tag);
|
||||
#endif
|
||||
|
||||
#ifdef WMI_INTERFACE_EVENT_LOGGING
|
||||
|
@@ -24,11 +24,6 @@
|
||||
* under proprietary terms before Copyright ownership was assigned
|
||||
* to the Linux Foundation.
|
||||
*/
|
||||
#include "athdefs.h"
|
||||
#include "osapi_linux.h"
|
||||
#include "a_types.h"
|
||||
#include "a_debug.h"
|
||||
#include "ol_if_athvar.h"
|
||||
#include "wmi_unified_priv.h"
|
||||
#include "wmi_unified_param.h"
|
||||
|
||||
|
@@ -25,14 +25,9 @@
|
||||
* to the Linux Foundation.
|
||||
*/
|
||||
|
||||
#include "athdefs.h"
|
||||
#include "osapi_linux.h"
|
||||
#include "a_types.h"
|
||||
#include "a_debug.h"
|
||||
#include "wlan_defs.h"
|
||||
#include "ol_if_athvar.h"
|
||||
#include "wmi_unified_api.h"
|
||||
#include "wmi_unified_priv.h"
|
||||
#include "hif.h"
|
||||
|
||||
#if defined(WMI_NON_TLV_SUPPORT) || defined(WMI_TLV_AND_NON_TLV_SUPPORT)
|
||||
#include "wmi.h"
|
||||
|
Reference in New Issue
Block a user