From f2cbd5725b3764d0436cd1ef0b5ca85909794096 Mon Sep 17 00:00:00 2001 From: HW-cjd Date: Fri, 12 Apr 2024 17:07:55 +0800 Subject: [PATCH 1/2] change include Signed-off-by: HW-cjd --- adapter/khdf/linux/model/network/wifi/hdfwifi.mk | 2 ++ adapter/khdf/linux/test/test_khdf.mk | 2 ++ adapter/khdf/liteos/ndk/BUILD.gn | 2 ++ adapter/khdf/liteos/test/BUILD.gn | 1 + adapter/khdf/liteos/test/test_lite.mk | 1 + framework/model/network/wifi/core/module/wifi_base.c | 2 +- .../model/network/wifi/platform/src/message/nodes/local_node.c | 3 ++- 7 files changed, 11 insertions(+), 2 deletions(-) diff --git a/adapter/khdf/linux/model/network/wifi/hdfwifi.mk b/adapter/khdf/linux/model/network/wifi/hdfwifi.mk index e0571f4ec..56245dbdb 100755 --- a/adapter/khdf/linux/model/network/wifi/hdfwifi.mk +++ b/adapter/khdf/linux/model/network/wifi/hdfwifi.mk @@ -48,6 +48,8 @@ HDF_WIFI_FRAMEWORKS_INC := \ -I$(srctree)/drivers/hdf/framework/model/network/common/netdevice \ -I$(srctree)/drivers/hdf/framework/model/network/wifi/platform/include \ -I$(srctree)/drivers/hdf/framework/model/network/wifi/platform/include/message \ + -I$(srctree)/drivers/hdf/framework/model/network/wifi/platform/src \ + -I$(srctree)/drivers/hdf/framework/model/network/wifi/platform/src/message \ -I$(srctree)/drivers/hdf/framework/model/network/wifi/client/include \ -I$(srctree)/drivers/hdf/framework/include/wifi \ -I$(srctree)/drivers/hdf/framework/include/net \ diff --git a/adapter/khdf/linux/test/test_khdf.mk b/adapter/khdf/linux/test/test_khdf.mk index 116ef7565..f1377d9f4 100644 --- a/adapter/khdf/linux/test/test_khdf.mk +++ b/adapter/khdf/linux/test/test_khdf.mk @@ -61,6 +61,8 @@ ccflags-$(CONFIG_DRIVERS_HDF_TEST) += -I$(srctree)/drivers/hdf/framework/include -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/network/wifi/core/components/softap \ -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/network/wifi/core/components/sta \ -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/network/wifi/platform/include \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/network/wifi/platform/src \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/network/wifi/platform/src/message \ -I$(srctree)/bounds_checking_function/include \ -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/platform \ -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/platform/entry \ diff --git a/adapter/khdf/liteos/ndk/BUILD.gn b/adapter/khdf/liteos/ndk/BUILD.gn index 7c39a3cfe..9b75cd6e5 100644 --- a/adapter/khdf/liteos/ndk/BUILD.gn +++ b/adapter/khdf/liteos/ndk/BUILD.gn @@ -79,6 +79,8 @@ ndk_lib("driver_wlan_notes") { "$HDF_FRAMEWORK_PATH/include/wifi", "$HDF_FRAMEWORK_PATH/include/net", "$HDF_FRAMEWORK_PATH/model/network/wifi/platform/include", + "$HDF_FRAMEWORK_PATH/model/network/wifi/platform/src", + "$HDF_FRAMEWORK_PATH/model/network/wifi/platform/src/message", ] } diff --git a/adapter/khdf/liteos/test/BUILD.gn b/adapter/khdf/liteos/test/BUILD.gn index 3e82dfcd1..3ec60e9c0 100644 --- a/adapter/khdf/liteos/test/BUILD.gn +++ b/adapter/khdf/liteos/test/BUILD.gn @@ -343,6 +343,7 @@ config("test_lite") { "$HDF_FRAMEWORKS_PATH/model/network/wifi/platform/include", "$HDF_FRAMEWORKS_PATH/model/network/wifi/platform/include/message", "$HDF_FRAMEWORKS_PATH/model/network/wifi/platform/src", + "$HDF_FRAMEWORKS_PATH/model/network/wifi/platform/src/message", "$HDF_FRAMEWORKS_PATH/model/network/wifi/core/components/softap", "$HDF_FRAMEWORKS_PATH/model/network/wifi/core/components/sta", "$HDF_FRAMEWORKS_PATH/include/wifi", diff --git a/adapter/khdf/liteos/test/test_lite.mk b/adapter/khdf/liteos/test/test_lite.mk index f78ce60ff..ffc379dd3 100644 --- a/adapter/khdf/liteos/test/test_lite.mk +++ b/adapter/khdf/liteos/test/test_lite.mk @@ -80,6 +80,7 @@ HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/hdf_core/framework/model/network/wif HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/hdf_core/framework/model/network/wifi/platform/include HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/hdf_core/framework/model/network/wifi/platform/include/message HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/hdf_core/framework/model/network/wifi/platform/src +HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/hdf_core/framework/model/network/wifi/platform/src/message HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/hdf_core/framework/model/network/wifi/core/components/softap HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/hdf_core/framework/model/network/wifi/core/components/sta HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/hdf_core/framework/include/wifi diff --git a/framework/model/network/wifi/core/module/wifi_base.c b/framework/model/network/wifi/core/module/wifi_base.c index 42007fec6..b0f722a19 100644 --- a/framework/model/network/wifi/core/module/wifi_base.c +++ b/framework/model/network/wifi/core/module/wifi_base.c @@ -6,7 +6,7 @@ * See the LICENSE file in the root of this repository for complete details. */ #include "wifi_base.h" -#include "../hdf_wifi_core.h" +#include "hdf_wifi_core.h" #include "eapol.h" #include "hdf_wifi_event.h" #include "hdf_wlan_chipdriver_manager.h" diff --git a/framework/model/network/wifi/platform/src/message/nodes/local_node.c b/framework/model/network/wifi/platform/src/message/nodes/local_node.c index 6cdfba889..439c265fb 100644 --- a/framework/model/network/wifi/platform/src/message/nodes/local_node.c +++ b/framework/model/network/wifi/platform/src/message/nodes/local_node.c @@ -8,9 +8,10 @@ #include "securec.h" #include "hdf_log.h" +#include "message/message_router_inner.h" +#include "message_router_inner.h" #include "hdf_wlan_priority_queue.h" #include "message/message_types.h" -#include "../message_router_inner.h" #include "sidecar.h" #ifdef USERSPACE_CLIENT_SUPPORT -- Gitee From c07a0142516ecc491b58fa73bae165315fd6ca76 Mon Sep 17 00:00:00 2001 From: HW-cjd Date: Fri, 12 Apr 2024 09:28:30 +0000 Subject: [PATCH 2/2] update framework/model/network/wifi/platform/src/message/nodes/local_node.c. Signed-off-by: HW-cjd --- .../model/network/wifi/platform/src/message/nodes/local_node.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/framework/model/network/wifi/platform/src/message/nodes/local_node.c b/framework/model/network/wifi/platform/src/message/nodes/local_node.c index 439c265fb..4e7bc89ca 100644 --- a/framework/model/network/wifi/platform/src/message/nodes/local_node.c +++ b/framework/model/network/wifi/platform/src/message/nodes/local_node.c @@ -8,10 +8,9 @@ #include "securec.h" #include "hdf_log.h" -#include "message/message_router_inner.h" -#include "message_router_inner.h" #include "hdf_wlan_priority_queue.h" #include "message/message_types.h" +#include "message_router_inner.h" #include "sidecar.h" #ifdef USERSPACE_CLIENT_SUPPORT -- Gitee