From 753eb7d88e5e8b2a2fb1ce6be5742ec4bec0d998 Mon Sep 17 00:00:00 2001 From: Sathish Kumar Date: Tue, 25 Oct 2016 18:47:52 +0530 Subject: [PATCH] qcacmn: Adapt WIN driver with FW abstraction changes Recently added changes for coexistence of WIN/MCL TLV implementation through CL I6868c288a43fd3afb19c84b8a9d4ef0dfbee5c94 require adaptations in QCA WIN driver to successfully compile. Add required definitions in WMI layer to adapt WIN driver to changes made for coexistence. Change-Id: I99550ca10553d8096b8967249c006bac4e0c62df --- wmi_unified_non_tlv.h | 4 ++-- wmi_unified_param.h | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/wmi_unified_non_tlv.h b/wmi_unified_non_tlv.h index d475a67064..c32eb09af7 100644 --- a/wmi_unified_non_tlv.h +++ b/wmi_unified_non_tlv.h @@ -28,8 +28,8 @@ #include #include "a_types.h" #include "wmi_unified_param.h" -#include "legacy/wmi.h" -#include "legacy/wmi_unified.h" +#include "wmi.h" +#include "wmi_unified.h" #include "ol_defines.h" /* Fix Me: wmi_unified_t structure definition */ QDF_STATUS send_vdev_create_cmd_non_tlv(wmi_unified_t wmi_handle, diff --git a/wmi_unified_param.h b/wmi_unified_param.h index 69b02599e3..60762fc5ca 100644 --- a/wmi_unified_param.h +++ b/wmi_unified_param.h @@ -277,6 +277,29 @@ typedef enum { WMI_HOST_MODE_MAX = 16 } WMI_HOST_WLAN_PHY_MODE; +typedef enum { + WMI_HOST_VDEV_START_OK = 0, + WMI_HOST_VDEV_START_CHAN_INVALID, +} WMI_HOST_VDEV_START_STATUS; + +/* + * Needs to be removed and use channel_param based + * on how it is processed + */ +typedef struct { + /** primary 20 MHz channel frequency in mhz */ + uint32_t mhz; + /** Center frequency 1 in MHz*/ + uint32_t band_center_freq1; + /** Center frequency 2 in MHz - valid only for 11acvht 80plus80 mode*/ + uint32_t band_center_freq2; + /** channel info described below */ + uint32_t info; + /** contains min power, max power, reg power and reg class id. */ + uint32_t reg_info_1; + /** contains antennamax */ + uint32_t reg_info_2; +} wmi_host_channel; /** * enum wmi_dwelltime_adaptive_mode: dwelltime_mode @@ -5412,6 +5435,7 @@ enum wmi_host_scan_event_type { WMI_HOST_SCAN_EVENT_RESTARTED = 0x80, WMI_HOST_SCAN_EVENT_FOREIGN_CHANNEL_EXIT = 0x100, WMI_HOST_SCAN_EVENT_INVALID = 0x200, + WMI_HOST_SCAN_EVENT_GPIO_TIMEOUT = 0x400, WMI_HOST_SCAN_EVENT_MAX = 0x8000 };