From 1cce05a28b2fbc925f15f77ff491a04fb555a3d6 Mon Sep 17 00:00:00 2001 From: HW-cjd Date: Fri, 12 Apr 2024 14:52:40 +0800 Subject: [PATCH 1/3] change include Signed-off-by: HW-cjd --- adapter/khdf/linux/model/network/wifi/hdfwifi.mk | 1 + adapter/khdf/liteos/model/network/wifi/BUILD.gn | 1 + adapter/khdf/liteos/ndk/BUILD.gn | 1 + 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 | 2 +- 7 files changed, 7 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..139a049ce 100755 --- a/adapter/khdf/linux/model/network/wifi/hdfwifi.mk +++ b/adapter/khdf/linux/model/network/wifi/hdfwifi.mk @@ -48,6 +48,7 @@ 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/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/liteos/model/network/wifi/BUILD.gn b/adapter/khdf/liteos/model/network/wifi/BUILD.gn index 87316bf13..18f105e4c 100644 --- a/adapter/khdf/liteos/model/network/wifi/BUILD.gn +++ b/adapter/khdf/liteos/model/network/wifi/BUILD.gn @@ -73,5 +73,6 @@ hdf_driver(module_name) { "$FRAMEWORKS_WIFI_ROOT/bus", "$FRAMEWORKS_WIFI_ROOT/platform/include/message", "$FRAMEWORKS_WIFI_ROOT/platform/include", + "$FRAMEWORKS_WIFI_ROOT/platform/src/message", ] } diff --git a/adapter/khdf/liteos/ndk/BUILD.gn b/adapter/khdf/liteos/ndk/BUILD.gn index 7c39a3cfe..8edb8a26d 100644 --- a/adapter/khdf/liteos/ndk/BUILD.gn +++ b/adapter/khdf/liteos/ndk/BUILD.gn @@ -79,6 +79,7 @@ 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/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..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 @@ -10,7 +10,7 @@ #include "hdf_log.h" #include "hdf_wlan_priority_queue.h" #include "message/message_types.h" -#include "../message_router_inner.h" +#include "message_router_inner.h" #include "sidecar.h" #ifdef USERSPACE_CLIENT_SUPPORT -- Gitee From 3aecb0d074dccdaf23e00337619af2e03a5ac716 Mon Sep 17 00:00:00 2001 From: HW-cjd Date: Fri, 12 Apr 2024 08:30:32 +0000 Subject: [PATCH 2/3] update adapter/khdf/liteos/model/network/wifi/BUILD.gn. Signed-off-by: HW-cjd --- adapter/khdf/liteos/model/network/wifi/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adapter/khdf/liteos/model/network/wifi/BUILD.gn b/adapter/khdf/liteos/model/network/wifi/BUILD.gn index 18f105e4c..15b938a7c 100644 --- a/adapter/khdf/liteos/model/network/wifi/BUILD.gn +++ b/adapter/khdf/liteos/model/network/wifi/BUILD.gn @@ -73,6 +73,6 @@ hdf_driver(module_name) { "$FRAMEWORKS_WIFI_ROOT/bus", "$FRAMEWORKS_WIFI_ROOT/platform/include/message", "$FRAMEWORKS_WIFI_ROOT/platform/include", - "$FRAMEWORKS_WIFI_ROOT/platform/src/message", + "$FRAMEWORKS_WIFI_ROOT/platform/src", ] } -- Gitee From 246c7c210dcf295116e3ceb0d70afa6e511da081 Mon Sep 17 00:00:00 2001 From: HW-cjd Date: Fri, 12 Apr 2024 08:30:55 +0000 Subject: [PATCH 3/3] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4e7bc89ca..b25315fcb 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 @@ -10,7 +10,7 @@ #include "hdf_log.h" #include "hdf_wlan_priority_queue.h" #include "message/message_types.h" -#include "message_router_inner.h" +#include "message/message_router_inner.h" #include "sidecar.h" #ifdef USERSPACE_CLIENT_SUPPORT -- Gitee