diff options
| author | Victor Hsu <hsuvictor@google.com> | 2021-11-10 20:57:10 +0800 |
|---|---|---|
| committer | Victor Hsu <hsuvictor@google.com> | 2021-12-13 13:37:29 +0800 |
| commit | 5cfb486d3f2b5f46683495ae82c1060da8118be4 (patch) | |
| tree | 171b6f08e1a88ab4d60fae4b03f9c1e9128fae10 /cnss_utils | |
| parent | c972edc5cac0526943caaa390ddd0faf2ecb18db (diff) | |
| download | cnss2-5cfb486d3f2b5f46683495ae82c1060da8118be4.tar.gz | |
wcn6740: Change the include path to out-of-kernel tree
Change the include path to make sure to include
the correct header files in out-of-kernel tree.
Bug: 203725513
Signed-off-by: Victor Hsu <hsuvictor@google.com>
Change-Id: Iaff00aca3b1e3faa77ffb54bf7eb59b6ca296c58
Diffstat (limited to 'cnss_utils')
| -rw-r--r-- | cnss_utils/cnss_plat_ipc_qmi.c | 11 | ||||
| -rw-r--r-- | cnss_utils/cnss_plat_ipc_service_v01.c | 4 | ||||
| -rw-r--r-- | cnss_utils/cnss_utils.c | 4 | ||||
| -rw-r--r-- | cnss_utils/device_management_service_v01.c | 4 | ||||
| -rw-r--r-- | cnss_utils/wlan_firmware_service_v01.h | 4 |
5 files changed, 25 insertions, 2 deletions
diff --git a/cnss_utils/cnss_plat_ipc_qmi.c b/cnss_utils/cnss_plat_ipc_qmi.c index aa042f9..a28d743 100644 --- a/cnss_utils/cnss_plat_ipc_qmi.c +++ b/cnss_utils/cnss_plat_ipc_qmi.c @@ -3,12 +3,19 @@ #include <linux/module.h> #include <linux/kernel.h> +#ifdef CONFIG_CNSS_OUT_OF_TREE +#include "uapi/qrtr.h" +#include "ipc_logging.h" +#include "qmi/qmi.h" +#include "cnss_plat_ipc_qmi.h" +#else #include <linux/qrtr.h> -#include <linux/soc/qcom/qmi.h> #include <linux/ipc_logging.h> +#include <linux/soc/qcom/qmi.h> +#include <linux/cnss_plat_ipc_qmi.h> +#endif #include <linux/limits.h> #include <linux/slab.h> -#include <linux/cnss_plat_ipc_qmi.h> #include <linux/delay.h> #include <linux/workqueue.h> #include <linux/of.h> diff --git a/cnss_utils/cnss_plat_ipc_service_v01.c b/cnss_utils/cnss_plat_ipc_service_v01.c index c8cb323..664e117 100644 --- a/cnss_utils/cnss_plat_ipc_service_v01.c +++ b/cnss_utils/cnss_plat_ipc_service_v01.c @@ -1,7 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-only /* Copyright (c) 2021, The Linux Foundation. All rights reserved. */ +#ifdef CONFIG_CNSS_OUT_OF_TREE +#include "qmi/qmi.h" +#else #include <linux/soc/qcom/qmi.h> +#endif #include "cnss_plat_ipc_service_v01.h" diff --git a/cnss_utils/cnss_utils.c b/cnss_utils/cnss_utils.c index 6bb7dfc..ef94c65 100644 --- a/cnss_utils/cnss_utils.c +++ b/cnss_utils/cnss_utils.c @@ -9,7 +9,11 @@ #include <linux/etherdevice.h> #include <linux/debugfs.h> #include <linux/of.h> +#ifdef CONFIG_CNSS_OUT_OF_TREE +#include "cnss_utils.h" +#else #include <net/cnss_utils.h> +#endif #define CNSS_MAX_CH_NUM 157 struct cnss_unsafe_channel_list { diff --git a/cnss_utils/device_management_service_v01.c b/cnss_utils/device_management_service_v01.c index 729615f..c9f4247 100644 --- a/cnss_utils/device_management_service_v01.c +++ b/cnss_utils/device_management_service_v01.c @@ -1,7 +1,11 @@ // SPDX-License-Identifier: GPL-2.0-only /* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */ +#ifdef CONFIG_CNSS_OUT_OF_TREE +#include "qmi/qmi.h" +#else #include <linux/soc/qcom/qmi.h> +#endif #include "device_management_service_v01.h" diff --git a/cnss_utils/wlan_firmware_service_v01.h b/cnss_utils/wlan_firmware_service_v01.h index 458f472..6e313c7 100644 --- a/cnss_utils/wlan_firmware_service_v01.h +++ b/cnss_utils/wlan_firmware_service_v01.h @@ -4,7 +4,11 @@ #ifndef WLAN_FIRMWARE_SERVICE_V01_H #define WLAN_FIRMWARE_SERVICE_V01_H +#ifdef CONFIG_CNSS_OUT_OF_TREE +#include "qmi/qmi.h" +#else #include <linux/soc/qcom/qmi.h> +#endif #define WLFW_SERVICE_ID_V01 0x45 #define WLFW_SERVICE_VERS_V01 0x01 |