From f72cb1f1ff36478fef738793d58c0458c1842e56 Mon Sep 17 00:00:00 2001
From: Balamurugan Mahalingam <bmahalin@codeaurora.org>
Date: Mon, 25 Jun 2018 12:18:34 +0530
Subject: [PATCH] qcacmn: include hal_hw_headers.h header file

macros and fw cmn headers included in hal_internal.h is moved
to a new hal_hw_headers.h to avoid these getting included in hif
layer. Include the new hal_hw_headers.h file

Change-Id: I3390ae9e71ca561d94a265e1fdf4d9354e7b2474
---
 dp/wifi3.0/dp_htt.c     | 1 +
 dp/wifi3.0/dp_ipa.c     | 3 ++-
 dp/wifi3.0/dp_peer.c    | 1 +
 dp/wifi3.0/dp_tx_desc.c | 1 +
 dp/wifi3.0/dp_tx_me.c   | 1 +
 dp/wifi3.0/dp_types.h   | 1 +
 hal/wifi3.0/hal_reo.c   | 1 +
 hal/wifi3.0/hal_rx.c    | 1 +
 hal/wifi3.0/hal_wbm.c   | 1 +
 9 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dp/wifi3.0/dp_htt.c b/dp/wifi3.0/dp_htt.c
index 190da69858ff..d31c8784ca14 100644
--- a/dp/wifi3.0/dp_htt.c
+++ b/dp/wifi3.0/dp_htt.c
@@ -17,6 +17,7 @@
  */
 
 #include <htt.h>
+#include <hal_hw_headers.h>
 #include <hal_api.h>
 #include "dp_htt.h"
 #include "dp_peer.h"
diff --git a/dp/wifi3.0/dp_ipa.c b/dp/wifi3.0/dp_ipa.c
index b8df37008748..715bc82717b1 100644
--- a/dp/wifi3.0/dp_ipa.c
+++ b/dp/wifi3.0/dp_ipa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018, The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -19,6 +19,7 @@
 #include <qdf_ipa_wdi3.h>
 #include <qdf_types.h>
 #include <qdf_lock.h>
+#include <hal_hw_headers.h>
 #include <hal_api.h>
 #include <hif.h>
 #include <htt.h>
diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c
index 2a93da13e15b..8b28658a72be 100644
--- a/dp/wifi3.0/dp_peer.c
+++ b/dp/wifi3.0/dp_peer.c
@@ -18,6 +18,7 @@
 
 #include <qdf_types.h>
 #include <qdf_lock.h>
+#include <hal_hw_headers.h>
 #include "dp_htt.h"
 #include "dp_types.h"
 #include "dp_internal.h"
diff --git a/dp/wifi3.0/dp_tx_desc.c b/dp/wifi3.0/dp_tx_desc.c
index 8ae706525446..12a0919d9174 100644
--- a/dp/wifi3.0/dp_tx_desc.c
+++ b/dp/wifi3.0/dp_tx_desc.c
@@ -16,6 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "hal_hw_headers.h"
 #include "dp_types.h"
 #include "dp_tx_desc.h"
 
diff --git a/dp/wifi3.0/dp_tx_me.c b/dp/wifi3.0/dp_tx_me.c
index ff769a57a3e9..b45209e32c81 100644
--- a/dp/wifi3.0/dp_tx_me.c
+++ b/dp/wifi3.0/dp_tx_me.c
@@ -16,6 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "hal_hw_headers.h"
 #include "dp_types.h"
 #include "qdf_nbuf.h"
 #include "qdf_atomic.h"
diff --git a/dp/wifi3.0/dp_types.h b/dp/wifi3.0/dp_types.h
index 0cd94c01ff80..95610deccb84 100644
--- a/dp/wifi3.0/dp_types.h
+++ b/dp/wifi3.0/dp_types.h
@@ -40,6 +40,7 @@
 #include <wdi_event_api.h>    /* WDI subscriber event list */
 #endif
 
+#include "hal_hw_headers.h"
 #include <hal_tx.h>
 #include <hal_reo.h>
 #include "wlan_cfg.h"
diff --git a/hal/wifi3.0/hal_reo.c b/hal/wifi3.0/hal_reo.c
index 7b4bc5ac2c56..5940ce05b661 100644
--- a/hal/wifi3.0/hal_reo.c
+++ b/hal/wifi3.0/hal_reo.c
@@ -16,6 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "hal_hw_headers.h"
 #include "hal_reo.h"
 #include "hal_tx.h"
 #include "qdf_module.h"
diff --git a/hal/wifi3.0/hal_rx.c b/hal/wifi3.0/hal_rx.c
index 44cac9ea9244..c982b346d07d 100644
--- a/hal/wifi3.0/hal_rx.c
+++ b/hal/wifi3.0/hal_rx.c
@@ -17,6 +17,7 @@
  */
 
 #include "hal_api.h"
+#include "hal_hw_headers.h"
 #include "qdf_module.h"
 
 /* TODO: See if the following definition is available in HW headers */
diff --git a/hal/wifi3.0/hal_wbm.c b/hal/wifi3.0/hal_wbm.c
index a25fb8ce9a5c..2b39874cb842 100644
--- a/hal/wifi3.0/hal_wbm.c
+++ b/hal/wifi3.0/hal_wbm.c
@@ -18,6 +18,7 @@
 
 #include "hal_api.h"
 #include "qdf_module.h"
+#include "hal_hw_headers.h"
 
 /**
  * hal_setup_link_idle_list - Setup scattered idle list using the