From 424c62e877c36b4c66595b94eb753958cbab992f Mon Sep 17 00:00:00 2001
From: Pratik Gandhi <prgandhi@codeaurora.org>
Date: Tue, 23 Aug 2016 19:47:09 +0530
Subject: [PATCH] qcacmn: Address compilation issues for WIN new fw headers

Address compilation issues for WIN with new Lithium Firmware headers.
Also removed dependency on htt.h from header files, which may need to
add explicit dependency on htt.h in .c files.

Change-Id: Ia5027963837e645bc3f81a3db98c2ea06789aea8
CRs-Fixed: 1061096
---
 dp/inc/cdp_txrx_cmn.h         |  3 +--
 dp/inc/cdp_txrx_ctrl.h        | 12 ++++++------
 hif/inc/hif.h                 |  4 +++-
 hif/src/ce/ce_main.c          |  2 ++
 wmi/src/wmi_unified_non_tlv.c |  1 +
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/dp/inc/cdp_txrx_cmn.h b/dp/inc/cdp_txrx_cmn.h
index a992691d8b0f..efa4d3ff1f27 100644
--- a/dp/inc/cdp_txrx_cmn.h
+++ b/dp/inc/cdp_txrx_cmn.h
@@ -33,7 +33,6 @@
 #define _CDP_TXRX_CMN_H_
 
 #include "htc_api.h"
-#include "htt.h"
 #include "qdf_types.h"
 #include "qdf_nbuf.h"
 
@@ -157,7 +156,7 @@ typedef int (*ol_txrx_proxy_arp_fp)(ol_osif_vdev_handle vdev,
  * ol_txrx_stats_callback - statistics notify callback
  */
 typedef void (*ol_txrx_stats_callback)(void *ctxt,
-				       enum htt_dbg_stats_type type,
+				       uint32_t type,
 				       uint8_t *buf, int bytes);
 
 /**
diff --git a/dp/inc/cdp_txrx_ctrl.h b/dp/inc/cdp_txrx_ctrl.h
index daaea25ff991..f12371bc971e 100644
--- a/dp/inc/cdp_txrx_ctrl.h
+++ b/dp/inc/cdp_txrx_ctrl.h
@@ -148,13 +148,13 @@ ol_txrx_set_drop_unenc(
  *  This will be used to populate the HTT desc packet type field during Tx
  *
  * @param vdev - the data virtual device object
- * @param val - the Tx encap type
+ * @param val - the Tx encap type (htt_pkt_type)
  * @return - void
  */
 void
 ol_txrx_set_tx_encap_type(
 	ol_txrx_vdev_handle vdev,
-	enum htt_pkt_type val);
+	uint32_t val);
 
 /**
  * @brief set the Rx decapsulation type of the VDEV
@@ -163,21 +163,21 @@ ol_txrx_set_tx_encap_type(
  *  decap all Rx packets into, for all peers under the VDEV.
  *
  * @param vdev - the data virtual device object
- * @param val - the Rx decap mode
+ * @param val - the Rx decap mode (htt_pkt_type)
  * @return - void
  */
 void
 ol_txrx_set_vdev_rx_decap_type(
 	ol_txrx_vdev_handle vdev,
-	enum htt_pkt_type val);
+	uint32_t val);
 
 /**
  * @brief get the Rx decapsulation type of the VDEV
  *
  * @param vdev - the data virtual device object
- * @return - the Rx decap type
+ * @return - the Rx decap type (htt_pkt_type)
  */
-enum htt_pkt_type
+uint32_t
 ol_txrx_get_vdev_rx_decap_type(ol_txrx_vdev_handle vdev);
 
 /* Is this similar to ol_txrx_peer_state_update() in MCL */
diff --git a/hif/inc/hif.h b/hif/inc/hif.h
index 61a23e2f49ca..d1c8c77dadaf 100644
--- a/hif/inc/hif.h
+++ b/hif/inc/hif.h
@@ -68,6 +68,7 @@ typedef void *hif_handle_t;
  * moved to latest copy of fw common header files.
  */
 #ifdef CONFIG_WIN
+#if ENABLE_10_4_FW_HDR
 #define TARGET_TYPE_UNKNOWN   0
 #define TARGET_TYPE_AR6001    1
 #define TARGET_TYPE_AR6002    2
@@ -90,9 +91,10 @@ typedef void *hif_handle_t;
 #define TARGET_TYPE_AR6320V3    16
 /* For Tufello1.0 target_reg_tbl ID*/
 #define TARGET_TYPE_QCA9377V1   17
+#endif /* ENABLE_10_4_FW_HDR */
 /* For Adrastea target */
 #define TARGET_TYPE_ADRASTEA     19
-#endif
+#endif /* CONFIG_WIN */
 
 struct CE_state;
 #define CE_COUNT_MAX 12
diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c
index 6f4000427c5e..e6be8ba63afa 100644
--- a/hif/src/ce/ce_main.c
+++ b/hif/src/ce/ce_main.c
@@ -75,10 +75,12 @@ static int hif_post_recv_buffers_for_pipe(struct HIF_CE_pipe_info *pipe_info);
 #endif
 
 #ifdef CONFIG_WIN
+#if ENABLE_10_4_FW_HDR
 #define WDI_IPA_SERVICE_GROUP 5
 #define WDI_IPA_TX_SVC MAKE_SERVICE_ID(WDI_IPA_SERVICE_GROUP, 0)
 #define HTT_DATA2_MSG_SVC MAKE_SERVICE_ID(HTT_SERVICE_GROUP, 1)
 #define HTT_DATA3_MSG_SVC MAKE_SERVICE_ID(HTT_SERVICE_GROUP, 2)
+#endif /* ENABLE_10_4_FW_HDR */
 #endif
 
 static int hif_post_recv_buffers(struct hif_softc *scn);
diff --git a/wmi/src/wmi_unified_non_tlv.c b/wmi/src/wmi_unified_non_tlv.c
index aac8757571e3..381b81aba581 100644
--- a/wmi/src/wmi_unified_non_tlv.c
+++ b/wmi/src/wmi_unified_non_tlv.c
@@ -29,6 +29,7 @@
 #include "osapi_linux.h"
 #include "a_types.h"
 #include "a_debug.h"
+#include "wlan_defs.h"
 #include "ol_if_athvar.h"
 #include "ol_defines.h"
 #include "wmi_unified_api.h"