From 5842d7b40097a596a99d833a81ca92e4691c3678 Mon Sep 17 00:00:00 2001 From: northking-super Date: Mon, 29 Nov 2021 07:50:37 +0000 Subject: [PATCH 1/2] folder structure change Signed-off-by: northking-super --- model/network/wifi/hdfwifi.mk | 4 ++-- model/network/wifi/vendor/Makefile | 2 +- model/network/wifi/vendor/hi3881/Makefile | 4 ++-- patch_hdf.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) mode change 100644 => 100755 model/network/wifi/hdfwifi.mk mode change 100644 => 100755 model/network/wifi/vendor/hi3881/Makefile diff --git a/model/network/wifi/hdfwifi.mk b/model/network/wifi/hdfwifi.mk old mode 100644 new mode 100755 index e3f81f4..b4471d2 --- a/model/network/wifi/hdfwifi.mk +++ b/model/network/wifi/hdfwifi.mk @@ -14,7 +14,7 @@ HDF_WIFI_FRAMEWORKS_ROOT = $(HDF_DIR_PREFIX)/framework/model/network/wifi HDF_WIFI_KHDF_FRAMEWORKS_ROOT = $(HDF_DIR_PREFIX)/adapter/khdf/linux/model/network/wifi -HDF_WIFI_VENDOR_ROOT = $(HDF_VENDOR_PREFIX)/device/hisilicon/drivers/wifi/driver +HDF_WIFI_VENDOR_ROOT = $(HDF_VENDOR_PREFIX)/device/soc/hisilicon/common/platform/wifi/hi3881v100 HDF_FRAMEWORKS_INC := \ -I$(srctree)/drivers/hdf/framework/core/common/include/host \ -I$(srctree)/drivers/hdf/framework/core/host/include \ @@ -54,7 +54,7 @@ HDF_WIFI_ADAPTER_INC := \ -I$(srctree)/drivers/hdf/khdf/network/include HDF_WIFI_VENDOR_INC := \ - -I$(srctree)/drivers/hdf/wifi/driver/core + -I$(srctree)/drivers/hdf/hi3881v100/adapter SECURE_LIB_INC := \ -I$(srctree)/bounds_checking_function/include diff --git a/model/network/wifi/vendor/Makefile b/model/network/wifi/vendor/Makefile index 98e45c1..7219e5b 100755 --- a/model/network/wifi/vendor/Makefile +++ b/model/network/wifi/vendor/Makefile @@ -19,7 +19,7 @@ HDF_VENDOR_PREFIX := ../../../../../../../../ include drivers/hdf/khdf/model/network/wifi/hdfwifi.mk obj-$(CONFIG_DRIVERS_HDF_WIFI) += $(MODULE_NAME).o -$(MODULE_NAME)-objs := $(HDF_WIFI_VENDOR_ROOT)/core/hdf_wlan_sdio_adapt.o +$(MODULE_NAME)-objs := $(HDF_WIFI_VENDOR_ROOT)/adapter/hdf_wlan_sdio_adapt.o ccflags-$(CONFIG_DRIVERS_HDF_WIFI) += \ $(HDF_FRAMEWORKS_INC) \ diff --git a/model/network/wifi/vendor/hi3881/Makefile b/model/network/wifi/vendor/hi3881/Makefile old mode 100644 new mode 100755 index 23b3932..8573086 --- a/model/network/wifi/vendor/hi3881/Makefile +++ b/model/network/wifi/vendor/hi3881/Makefile @@ -19,8 +19,8 @@ HDF_VENDOR_PREFIX := ../../../../../../../../../ include drivers/hdf/khdf/model/network/wifi/hdfwifi.mk INC_TOP_PATH := drivers/hdf/wifi/driver/ -VENDOR_WIFI_PATH := device/hisilicon/drivers/wifi/driver -WIFI_DRIVER_DIR := hi3881 +VENDOR_WIFI_PATH := device/soc/hisilicon/common/platform/wifi/hi3881v100 +WIFI_DRIVER_DIR := driver ##################path of compile file :start############### #####wifi##### diff --git a/patch_hdf.sh b/patch_hdf.sh index 2082c8c..75a2b26 100755 --- a/patch_hdf.sh +++ b/patch_hdf.sh @@ -27,7 +27,7 @@ ln_list=( cp_list=( $OHOS_SOURCE_ROOT/third_party/bounds_checking_function ./ - $OHOS_SOURCE_ROOT/device/hisilicon/drivers/wifi drivers/hdf/ + $OHOS_SOURCE_ROOT/device/soc/hisilicon/common/platform/wifi drivers/hdf/ $OHOS_SOURCE_ROOT/third_party/FreeBSD/sys/dev/evdev drivers/hdf/ ) -- Gitee From a42d807596e526ee4f8c9a408ed97ef912c73a0a Mon Sep 17 00:00:00 2001 From: northking-super Date: Tue, 30 Nov 2021 06:14:32 +0000 Subject: [PATCH 2/2] fix wifi build err Signed-off-by: northking-super --- model/network/wifi/hdfwifi.mk | 2 +- model/network/wifi/vendor/hi3881/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model/network/wifi/hdfwifi.mk b/model/network/wifi/hdfwifi.mk index b4471d2..221c8fc 100755 --- a/model/network/wifi/hdfwifi.mk +++ b/model/network/wifi/hdfwifi.mk @@ -54,7 +54,7 @@ HDF_WIFI_ADAPTER_INC := \ -I$(srctree)/drivers/hdf/khdf/network/include HDF_WIFI_VENDOR_INC := \ - -I$(srctree)/drivers/hdf/hi3881v100/adapter + -I$(srctree)/drivers/hdf/wifi/hi3881v100/adapter SECURE_LIB_INC := \ -I$(srctree)/bounds_checking_function/include diff --git a/model/network/wifi/vendor/hi3881/Makefile b/model/network/wifi/vendor/hi3881/Makefile index 8573086..dd5d23c 100755 --- a/model/network/wifi/vendor/hi3881/Makefile +++ b/model/network/wifi/vendor/hi3881/Makefile @@ -18,7 +18,7 @@ HDF_VENDOR_PREFIX := ../../../../../../../../../ include drivers/hdf/khdf/model/network/wifi/hdfwifi.mk -INC_TOP_PATH := drivers/hdf/wifi/driver/ +INC_TOP_PATH := drivers/hdf/wifi/hi3881v100/ VENDOR_WIFI_PATH := device/soc/hisilicon/common/platform/wifi/hi3881v100 WIFI_DRIVER_DIR := driver -- Gitee