From 40b3c112d30d3ca0076a3824308fdca0c7de8748 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Fri, 25 Mar 2016 14:36:18 -0700 Subject: [PATCH] qcacld-3.0: CL 1478986 - update fw common interface files qcacld-2.0 to qcacld-3.0 propagation. Addition of new debug log IDs for the Timekeeper module and move qtimer fields from wmi_vdev_tsf_tstamp_action_cmd_fixed_param to wmi_vdev_tsf_report_event_fixed_param. Change-Id: I20f1dbb855b3cd0c2b8e9fe10c27e5164527e406 CRs-Fixed: 865207 --- target/inc/dbglog_id.h | 22 ++++++++++++++++++++++ target/inc/wmi_unified.h | 8 ++++---- target/inc/wmi_version.h | 2 +- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/target/inc/dbglog_id.h b/target/inc/dbglog_id.h index 472489990c49..1e860bca64b5 100644 --- a/target/inc/dbglog_id.h +++ b/target/inc/dbglog_id.h @@ -1586,6 +1586,28 @@ extern "C" { #define ERE_DBGID_STATS_TX 11 #define ERE_DBGID_STATS_RX 12 #define ERE_DBGID_DEFINITION_END 13 +/* IDs 14 - 251 reserved for ERE */ + +/* Timekeeper debug IDs */ +#define TIMEKEEPER_INIT 252 +#define TIMEKEEPER_OPEN 253 +#define TIMEKEEPER_CLOSE 254 +#define TIMEKEEPER_NEGOTIATE 255 +#define TIMEKEEPER_TMR_HNDLR 256 +#define TIMEKEEPER_UNITTEST 257 +#define TIMEKEEPER_LF_TMR_HNDLR 258 +#define TIMEKEEPER_DEINIT 259 +#define TIMEKEEPER_SLOTBITMAP 260 +#define TIMEKEEPER_CANCEL_SLOTBITMAP 261 +#define TIMEKEEPER_CONFIRM_SLOTBITMAP 262 +#define TIMEKEEPER_RESOLVE_SLOTBITMAP 263 +#define TIMEKEEPER_ADD_CHAN_ELEMENT 264 +#define TIMEKEEPER_REMOVE_CHAN_ELEMENT 265 +#define TIMEKEEPER_FIND_CHAN_ELEMENT 266 +#define TIMEKEEPER_QUERY_COMMITTED_SLOTBITMAP 267 +#define TIMEKEEPER_ENCODE_SLOTBITMAP 268 +#define TIMEKEEPER_SLOT_ARRAY_DBG 269 +#define TIMEKEEPER_POPULATE_MASTER 270 /* NLO DBGIDs */ #define NLO_DBGID_SSID_TO_BE_SCANNED_LIST 0 diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index a77ef1360151..97ac346eadc2 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -13631,10 +13631,6 @@ typedef struct { A_UINT32 vdev_id; /* action type, refer to wmi_tsf_tstamp_action */ A_UINT32 tsf_action; - /* low 32 bits of qtimer */ - A_UINT32 qtimer_low; - /* high 32 bits of qtimer */ - A_UINT32 qtimer_high; } wmi_vdev_tsf_tstamp_action_cmd_fixed_param; typedef struct { @@ -13647,6 +13643,10 @@ typedef struct { A_UINT32 tsf_low; /* high 32 bit of tsf */ A_UINT32 tsf_high; + /* low 32 bits of qtimer */ + A_UINT32 qtimer_low; + /* high 32 bits of qtimer */ + A_UINT32 qtimer_high; } wmi_vdev_tsf_report_event_fixed_param; typedef struct { diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 11764c171451..d8d07c70b0e2 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 225 +#define __WMI_REVISION_ 226 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work