From 1dc9384364c8f9bdd765d6541e98ea19d814d455 Mon Sep 17 00:00:00 2001 From: yuanbo Date: Tue, 28 Sep 2021 16:20:08 +0800 Subject: [PATCH] optimize hdf utils dirs Signed-off-by: yuanbo --- khdf/liteos/BUILD.gn | 17 ++-- khdf/liteos/Makefile | 18 ++-- khdf/liteos/lite.mk | 3 - khdf/liteos/model/input/BUILD.gn | 2 +- khdf/liteos/model/network/ethernet/BUILD.gn | 2 +- khdf/liteos/ndk/BUILD.gn | 11 +-- khdf/liteos/test/BUILD.gn | 20 ++-- khdf/liteos/test/Makefile | 4 +- khdf/liteos/test/test_lite.mk | 4 +- khdf/liteos_m/core/BUILD.gn | 17 ++-- khdf/liteos_m/platform/BUILD.gn | 2 +- uhdf/manager/BUILD.gn | 5 +- uhdf/platform/BUILD.gn | 5 +- uhdf/test/unittest/common/BUILD.gn | 1 - uhdf/test/unittest/config/BUILD.gn | 4 +- uhdf/test/unittest/manager/BUILD.gn | 8 +- uhdf/test/unittest/osal/BUILD.gn | 4 - uhdf/test/unittest/platform/BUILD.gn | 4 - uhdf2/config/BUILD.gn | 58 ----------- uhdf2/hdi/BUILD.gn | 9 +- uhdf2/hdi/test/BUILD.gn | 4 +- .../sample_client_c/unittest/BUILD.gn | 3 +- .../sample_client_cpp/unittest/BUILD.gn | 3 +- .../test/hdi_sample/sample_service_c/BUILD.gn | 2 +- .../hdi_sample/sample_service_cpp/BUILD.gn | 2 +- uhdf2/host/BUILD.gn | 30 +----- uhdf2/host/test/BUILD.gn | 2 +- .../host/test/unittest/sample_driver/BUILD.gn | 6 +- uhdf2/ipc/BUILD.gn | 3 +- uhdf2/manager/BUILD.gn | 12 +-- uhdf2/ohos.build | 3 +- uhdf2/osal/BUILD.gn | 3 +- uhdf2/osal/{ => src}/osal_sysevent.c | 0 uhdf2/osal/test/BUILD.gn | 4 +- uhdf2/security/BUILD.gn | 5 +- uhdf2/test/unittest/common/BUILD.gn | 2 +- uhdf2/test/unittest/config/BUILD.gn | 4 +- uhdf2/test/unittest/manager/BUILD.gn | 11 +-- uhdf2/test/unittest/osal/BUILD.gn | 8 +- uhdf2/test/unittest/platform/BUILD.gn | 4 +- uhdf2/utils/BUILD.gn | 99 +++++++++++++++++++ .../config => utils/include}/hcs_dm_parser.h | 0 .../src/hcs_parser}/hcs_blob_load.c | 0 .../src/hcs_parser}/hcs_blob_load.h | 0 .../src/hcs_parser}/hcs_dm_parser.c | 0 45 files changed, 177 insertions(+), 231 deletions(-) delete mode 100644 uhdf2/config/BUILD.gn rename uhdf2/osal/{ => src}/osal_sysevent.c (100%) create mode 100644 uhdf2/utils/BUILD.gn rename uhdf2/{include/config => utils/include}/hcs_dm_parser.h (100%) rename uhdf2/{config/src => utils/src/hcs_parser}/hcs_blob_load.c (100%) rename uhdf2/{config/include => utils/src/hcs_parser}/hcs_blob_load.h (100%) rename uhdf2/{config/src => utils/src/hcs_parser}/hcs_dm_parser.c (100%) diff --git a/khdf/liteos/BUILD.gn b/khdf/liteos/BUILD.gn index 11a245a..3156001 100644 --- a/khdf/liteos/BUILD.gn +++ b/khdf/liteos/BUILD.gn @@ -34,13 +34,6 @@ module_switch = defined(LOSCFG_DRIVERS_HDF) module_name = "hdf" hdf_driver(module_name) { sources = [ - "$HDF_FRAMEWORKS_PATH/ability/config/device_resource_if.c", - "$HDF_FRAMEWORKS_PATH/ability/config/hcs_parser/src/hcs_blob_if.c", - "$HDF_FRAMEWORKS_PATH/ability/config/hcs_parser/src/hcs_generate_tree.c", - "$HDF_FRAMEWORKS_PATH/ability/config/hcs_parser/src/hcs_parser.c", - "$HDF_FRAMEWORKS_PATH/ability/config/hcs_parser/src/hcs_tree_if.c", - "$HDF_FRAMEWORKS_PATH/ability/sbuf/src/hdf_sbuf.c", - "$HDF_FRAMEWORKS_PATH/ability/sbuf/src/hdf_sbuf_impl_raw.c", "$HDF_FRAMEWORKS_PATH/core/adapter/vnode/src/hdf_vnode_adapter.c", "$HDF_FRAMEWORKS_PATH/core/common/src/devlite_object_config.c", "$HDF_FRAMEWORKS_PATH/core/common/src/devmgr_service_start.c", @@ -70,8 +63,15 @@ hdf_driver(module_name) { "$HDF_FRAMEWORKS_PATH/core/shared/src/hdf_io_service.c", "$HDF_FRAMEWORKS_PATH/core/shared/src/hdf_object_manager.c", "$HDF_FRAMEWORKS_PATH/core/shared/src/hdf_service_record.c", + "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/device_resource_if.c", + "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_blob_if.c", + "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_generate_tree.c", + "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_parser.c", + "$HDF_FRAMEWORKS_PATH/utils/src/hcs_parser/hcs_tree_if.c", "$HDF_FRAMEWORKS_PATH/utils/src/hdf_cstring.c", "$HDF_FRAMEWORKS_PATH/utils/src/hdf_map.c", + "$HDF_FRAMEWORKS_PATH/utils/src/hdf_sbuf.c", + "$HDF_FRAMEWORKS_PATH/utils/src/hdf_sbuf_impl_raw.c", "$HDF_FRAMEWORKS_PATH/utils/src/hdf_slist.c", "$HDF_FRAMEWORKS_PATH/utils/src/hdf_sref.c", "osal/src/osal_cdev.c", @@ -264,7 +264,6 @@ config("hdf_config") { "$HDF_FRAMEWORKS_PATH/model/storage/include", "$HDF_FRAMEWORKS_PATH/model/storage/include/mmc", "$HDF_FRAMEWORKS_PATH/model/storage/include/mtd", - "$HDF_FRAMEWORKS_PATH/ability/sbuf/include", "$HDF_FRAMEWORKS_PATH/support/platform/include", "$HDF_FRAMEWORKS_PATH/core/host/include", "$HDF_FRAMEWORKS_PATH/core/manager/include", @@ -279,8 +278,6 @@ config("hdf_config") { "model/storage/include/mtd", "$HDF_FRAMEWORKS_PATH/core/adapter/vnode/include", "$HDF_FRAMEWORKS_PATH/core/adapter/syscall/include", - "$HDF_FRAMEWORKS_PATH/include/config", - "$HDF_FRAMEWORKS_PATH/ability/config/hcs_parser/include", ] } diff --git a/khdf/liteos/Makefile b/khdf/liteos/Makefile index 13f5435..9fd70f0 100644 --- a/khdf/liteos/Makefile +++ b/khdf/liteos/Makefile @@ -43,11 +43,11 @@ LOCAL_SRCS := ./osal/src/osal_timer.c \ ./osal/src/osal_workqueue.c \ ./osal/src/osal_cdev.c \ $(HDF_FRAMEWORKS)/utils/src/hdf_cstring.c \ - $(HDF_FRAMEWORKS)/utils/src/hdf_map.c \ + $(HDF_FRAMEWORKS)/utils/src/hdf_map.c \ $(HDF_FRAMEWORKS)/utils/src/hdf_slist.c \ $(HDF_FRAMEWORKS)/utils/src/hdf_sref.c \ - $(HDF_FRAMEWORKS)/ability/sbuf/src/hdf_sbuf.c \ - $(HDF_FRAMEWORKS)/ability/sbuf/src/hdf_sbuf_impl_raw.c \ + $(HDF_FRAMEWORKS)/utils/src/hdf_sbuf.c \ + $(HDF_FRAMEWORKS)/utils/src/hdf_sbuf_impl_raw.c \ ./osal/src/osal_mem.c \ ./osal/src/osal_mutex.c \ ./osal/src/osal_sem.c \ @@ -80,12 +80,12 @@ LOCAL_SRCS := ./osal/src/osal_timer.c \ $(HDF_FRAMEWORKS)/core/common/src/load_driver_entry.c \ $(HDF_FRAMEWORKS)/core/common/src/devmgr_service_start.c \ $(HDF_FRAMEWORKS)/core/common/src/hdf_device_node_ext.c \ - $(HDF_FRAMEWORKS)/ability/config/hcs_parser/src/hcs_blob_if.c \ - $(HDF_FRAMEWORKS)/ability/config/hcs_parser/src/hcs_parser.c \ - $(HDF_FRAMEWORKS)/ability/config/hcs_parser/src/hcs_generate_tree.c \ - $(HDF_FRAMEWORKS)/ability/config/hcs_parser/src/hcs_tree_if.c \ - $(HDF_FRAMEWORKS)/ability/config/device_resource_if.c - + $(HDF_FRAMEWORKS)/utils/src/hcs_parser/hcs_blob_if.c \ + $(HDF_FRAMEWORKS)/utils/src/hcs_parser/hcs_parser.c \ + $(HDF_FRAMEWORKS)/utils/src/hcs_parser/hcs_generate_tree.c \ + $(HDF_FRAMEWORKS)/utils/src/hcs_parser/hcs_tree_if.c \ + $(HDF_FRAMEWORKS)/utils/src/hcs_parser/device_resource_if.c +LOCAL_CFLAGS += $(HDF_INCLUDE) ifeq ($(LOSCFG_DRIVERS_HDF_PLATFORM), y) LOCAL_SRCS += ./platform/src/plat_common.c \ $(HDF_FRAMEWORKS)/support/platform/src/common/platform_device.c \ diff --git a/khdf/liteos/lite.mk b/khdf/liteos/lite.mk index 4fb5abe..d384f24 100644 --- a/khdf/liteos/lite.mk +++ b/khdf/liteos/lite.mk @@ -46,7 +46,6 @@ HDF_INCLUDE += -I $(HDF_ROOT_DIR)/framework/model/network/common/netdevice HDF_INCLUDE += -I $(HDF_ROOT_DIR)/framework/model/storage/include HDF_INCLUDE += -I $(HDF_ROOT_DIR)/framework/model/storage/include/mmc HDF_INCLUDE += -I $(HDF_ROOT_DIR)/framework/model/storage/include/mtd -HDF_INCLUDE += -I $(HDF_ROOT_DIR)/framework/ability/sbuf/include HDF_INCLUDE += -I $(HDF_ROOT_DIR)/framework/support/platform/include HDF_INCLUDE += -I $(HDF_ROOT_DIR)/framework/support/platform/include/common HDF_INCLUDE += -I $(HDF_ROOT_DIR)/framework/core/host/include @@ -63,8 +62,6 @@ HDF_INCLUDE += -I $(HDF_ROOT_DIR)/adapter/khdf/liteos/model/storage/include/mtd HDF_INCLUDE += -I $(HDF_ROOT_DIR)/framework/core/adapter/vnode/include HDF_INCLUDE += -I $(HDF_ROOT_DIR)/framework/core/adapter/syscall/include HDF_INCLUDE += -I $(LITEOSTOPDIR)/bsd/compat/linuxkpi/include -HDF_INCLUDE += -I $(HDF_ROOT_DIR)/framework/include/config -HDF_INCLUDE += -I $(HDF_ROOT_DIR)/framework/ability/config/hcs_parser/include LOCAL_CFLAGS += $(HDF_INCLUDE) LOCAL_CFLAGS += $(HDF_CFLAGS) diff --git a/khdf/liteos/model/input/BUILD.gn b/khdf/liteos/model/input/BUILD.gn index 2fd2b59..b39cf18 100644 --- a/khdf/liteos/model/input/BUILD.gn +++ b/khdf/liteos/model/input/BUILD.gn @@ -54,6 +54,6 @@ hdf_driver(module_name) { include_dirs = [ "$FRAMEWORKS_INPUT_ROOT", "$FRAMEWORKS_INPUT_ROOT/input_bus_ops", - "//third_party/FreeBSD/sys/dev/evdev/" + "//third_party/FreeBSD/sys/dev/evdev/", ] } diff --git a/khdf/liteos/model/network/ethernet/BUILD.gn b/khdf/liteos/model/network/ethernet/BUILD.gn index 6d12a08..4e45744 100755 --- a/khdf/liteos/model/network/ethernet/BUILD.gn +++ b/khdf/liteos/model/network/ethernet/BUILD.gn @@ -34,9 +34,9 @@ module_name = "hdf_eth_model" hdf_driver(module_name) { FRAMEWORKS_ETHERNET_ROOT = "$HDF_FRAMEWORKS_PATH/model/network/ethernet" sources = [ + "$FRAMEWORKS_ETHERNET_ROOT/src/eth_chip_driver.c", "$FRAMEWORKS_ETHERNET_ROOT/src/eth_device.c", "$FRAMEWORKS_ETHERNET_ROOT/src/hdf_eth_core.c", - "$FRAMEWORKS_ETHERNET_ROOT/src/eth_chip_driver.c", ] include_dirs = [ diff --git a/khdf/liteos/ndk/BUILD.gn b/khdf/liteos/ndk/BUILD.gn index ff82357..bc56479 100755 --- a/khdf/liteos/ndk/BUILD.gn +++ b/khdf/liteos/ndk/BUILD.gn @@ -33,7 +33,6 @@ group("hdf_api") { if (ohos_kernel_type == "liteos_a") { deps += [ ":platform_notes" ] deps += [ ":driver_framework_notes" ] - deps += [ ":driver_config_notes" ] deps += [ ":hdi_display_notes" ] deps += [ ":hdi_input_notes" ] deps += [ ":hdi_audio_notes" ] @@ -53,15 +52,7 @@ ndk_lib("platform_notes") { ndk_lib("driver_framework_notes") { deps = [] - head_files = [ - "//drivers/framework/include/core", - "//drivers/framework/ability/sbuf/include", - ] -} - -ndk_lib("driver_config_notes") { - deps = [] - head_files = [ "//drivers/framework/include/config" ] + head_files = [ "//drivers/framework/include/core" ] } ndk_lib("hdi_display_notes") { diff --git a/khdf/liteos/test/BUILD.gn b/khdf/liteos/test/BUILD.gn index 04bb678..f7d0c0e 100644 --- a/khdf/liteos/test/BUILD.gn +++ b/khdf/liteos/test/BUILD.gn @@ -35,9 +35,7 @@ module_switch = defined(LOSCFG_DRIVERS_HDF_TEST) module_name = "hdf_test" hdf_driver(module_name) { sources = [ - "$HDF_TEST_FRAMWORK_ROOT/ability/config/hcs_parser/unittest/hcs_config_test.c", "$HDF_TEST_FRAMWORK_ROOT/common/hdf_main_test.c", - "$HDF_TEST_FRAMWORK_ROOT/config/hdf_config_test.c", "$HDF_TEST_FRAMWORK_ROOT/manager/sample_driver_test.c", "$HDF_TEST_FRAMWORK_ROOT/osal/osal_all_test.c", "$HDF_TEST_FRAMWORK_ROOT/osal/osal_file_test.c", @@ -45,6 +43,8 @@ hdf_driver(module_name) { "$HDF_TEST_FRAMWORK_ROOT/osal/osal_list_test.c", "$HDF_TEST_FRAMWORK_ROOT/osal/osal_test_entry.c", "$HDF_TEST_FRAMWORK_ROOT/osal/osal_work_test.c", + "$HDF_TEST_FRAMWORK_ROOT/utils/hcs_parser/unittest/hcs_config_test.c", + "$HDF_TEST_FRAMWORK_ROOT/utils/hcs_parser/unittest/hcs_parser_test.c", ] if (defined(LOSCFG_DRIVERS_HDF_WIFI)) { @@ -67,17 +67,19 @@ hdf_driver(module_name) { ] } - if (defined(LOSCFG_DRIVERS_HDF_USB_DDK_HOST) && defined(LOSCFG_DRIVERS_HDF_USB_PNP_NOTIFY)) { + if (defined(LOSCFG_DRIVERS_HDF_USB_DDK_HOST) && + defined(LOSCFG_DRIVERS_HDF_USB_PNP_NOTIFY)) { sources += [ - "$HDF_TEST_FRAMWORK_ROOT/model/usb/host/src/usb_test.c", - "$HDF_TEST_FRAMWORK_ROOT/model/usb/host/src/usb_raw_test.c", - "$HDF_TEST_FRAMWORK_ROOT/model/usb/host/src/usb_raw_io.c", "$HDF_TEST_FRAMWORK_ROOT/model/usb/host/src/hdf_usb_entry_test.c", + "$HDF_TEST_FRAMWORK_ROOT/model/usb/host/src/usb_raw_io.c", + "$HDF_TEST_FRAMWORK_ROOT/model/usb/host/src/usb_raw_test.c", + "$HDF_TEST_FRAMWORK_ROOT/model/usb/host/src/usb_test.c", ] } if (defined(LOSCFG_DRIVERS_HDF_PLATFORM)) { - sources += [ "$HDF_TEST_FRAMWORK_ROOT/platform/common/platform_driver_test.c" ] + sources += + [ "$HDF_TEST_FRAMWORK_ROOT/platform/common/platform_driver_test.c" ] if (defined(LOSCFG_DRIVERS_HDF_PLATFORM_GPIO)) { sources += [ @@ -178,9 +180,7 @@ config("test_lite") { "$HDF_FRAMEWORKS_PATH/utils/include", "$HDF_FRAMEWORKS_PATH/include/platform", "$HDF_FRAMEWORKS_PATH/include/core", - "$HDF_FRAMEWORKS_PATH/include/config", "$HDF_FRAMEWORKS_PATH/support/platform/include", - "$HDF_FRAMEWORKS_PATH/ability/sbuf/include", "$HDF_FRAMEWORKS_PATH/core/host/include", "$HDF_FRAMEWORKS_PATH/core/master/include", "$HDF_FRAMEWORKS_PATH/core/shared/include", @@ -200,7 +200,7 @@ config("test_lite") { "$HDF_TEST_FRAMWORK_ROOT/osal", "$HDF_TEST_FRAMWORK_ROOT/adapter/osal/unittest", "$HDF_TEST_FRAMWORK_ROOT/adapter/osal/include", - "$HDF_TEST_FRAMWORK_ROOT/ability/config/hcs_parser/unittest", + "$HDF_TEST_FRAMWORK_ROOT/utils/hcs_parser/unittest", "$HDF_TEST_FRAMWORK_ROOT", ] diff --git a/khdf/liteos/test/Makefile b/khdf/liteos/test/Makefile index a5ba08c..d851225 100644 --- a/khdf/liteos/test/Makefile +++ b/khdf/liteos/test/Makefile @@ -35,13 +35,13 @@ HDF_TEST_FRAMWORK_ROOT = $(LITEOSTOPDIR)/../../drivers/framework/test/unittest LOCAL_SRCS := $(HDF_TEST_FRAMWORK_ROOT)/common/hdf_main_test.c \ $(HDF_TEST_FRAMWORK_ROOT)/manager/sample_driver_test.c \ $(HDF_TEST_FRAMWORK_ROOT)/osal/osal_test_entry.c \ - $(HDF_TEST_FRAMWORK_ROOT)/config/hdf_config_test.c \ $(HDF_TEST_FRAMWORK_ROOT)/osal/osal_all_test.c \ $(HDF_TEST_FRAMWORK_ROOT)/osal/osal_file_test.c \ $(HDF_TEST_FRAMWORK_ROOT)/osal/osal_list_test.c \ $(HDF_TEST_FRAMWORK_ROOT)/osal/osal_work_test.c \ $(HDF_TEST_FRAMWORK_ROOT)/osal/osal_get_case_test.c \ - $(HDF_TEST_FRAMWORK_ROOT)/ability/config/hcs_parser/unittest/hcs_config_test.c + $(HDF_TEST_FRAMWORK_ROOT)/utils/hcs_parser/unittest/hcs_parser_test.c \ + $(HDF_TEST_FRAMWORK_ROOT)/utils/hcs_parser/unittest/hcs_config_test.c ifeq ($(LOSCFG_DRIVERS_HDF_WIFI), y) LOCAL_SRCS += $(HDF_TEST_FRAMWORK_ROOT)/wifi/hdf_wifi_test.c \ diff --git a/khdf/liteos/test/test_lite.mk b/khdf/liteos/test/test_lite.mk index da9ab32..269c96f 100644 --- a/khdf/liteos/test/test_lite.mk +++ b/khdf/liteos/test/test_lite.mk @@ -34,9 +34,7 @@ HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/include/utils HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/utils/include HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/include/platform HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/include/core -HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/include/config HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/support/platform/include -HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/ability/sbuf/include HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/core/host/include HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/core/master/include HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/core/shared/include @@ -56,7 +54,7 @@ HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/test/unittest/platform/com HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/test/unittest/osal HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/test/unittest/adapter/osal/unittest HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/test/unittest/adapter/osal/include -HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/test/unittest/ability/config/hcs_parser/unittest +HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/test/unittest/utils/hcs_parser/unittest HDF_TEST_INCLUDE += -I $(HDF_ROOT_TEST_DIR)/framework/test/unittest HDF_TEST_INCLUDE += -I $(LITEOSTOPDIR)/bsd/compat/linuxkpi/include HDF_TEST_INCLUDE += -I $(LITEOSTOPDIR)/../../base/hiviewdfx/hilog_lite/interfaces/native/innerkits diff --git a/khdf/liteos_m/core/BUILD.gn b/khdf/liteos_m/core/BUILD.gn index 053b5da..3e1dc63 100644 --- a/khdf/liteos_m/core/BUILD.gn +++ b/khdf/liteos_m/core/BUILD.gn @@ -42,7 +42,6 @@ config("libhdf_core_pub_config") { "$hdf_fwk_path/include/net", "$hdf_fwk_path/include/wifi", "$hdf_fwk_path/model/network/common/netdevice", - "$hdf_fwk_path/ability/sbuf/include", "$hdf_fwk_path/support/platform/include", "$hdf_fwk_path/core/host/include", "$hdf_fwk_path/core/manager/include", @@ -51,21 +50,12 @@ config("libhdf_core_pub_config") { "$hdf_fwk_path/core/common/include/host", "$hdf_fwk_path/core/adapter/vnode/include", "$hdf_fwk_path/core/adapter/syscall/include", - "$hdf_fwk_path/include/config", - "$hdf_fwk_path/ability/config/hcs_parser/include", "//kernel/liteos_m/components", ] } static_library("hdf_core") { sources = [ - "$hdf_fwk_path/ability/config/device_resource_if.c", - "$hdf_fwk_path/ability/config/hcs_parser/src/hcs_blob_if.c", - "$hdf_fwk_path/ability/config/hcs_parser/src/hcs_generate_tree.c", - "$hdf_fwk_path/ability/config/hcs_parser/src/hcs_parser.c", - "$hdf_fwk_path/ability/config/hcs_parser/src/hcs_tree_if.c", - "$hdf_fwk_path/ability/sbuf/src/hdf_sbuf.c", - "$hdf_fwk_path/ability/sbuf/src/hdf_sbuf_impl_raw.c", "$hdf_fwk_path/core/common/src/devlite_object_config.c", "$hdf_fwk_path/core/common/src/hdf_attribute.c", "$hdf_fwk_path/core/common/src/load_driver_entry.c", @@ -91,8 +81,15 @@ static_library("hdf_core") { "$hdf_fwk_path/core/shared/src/hdf_device_info.c", "$hdf_fwk_path/core/shared/src/hdf_object_manager.c", "$hdf_fwk_path/core/shared/src/hdf_service_record.c", + "$hdf_fwk_path/utils/src/hcs_parser/device_resource_if.c", + "$hdf_fwk_path/utils/src/hcs_parser/hcs_blob_if.c", + "$hdf_fwk_path/utils/src/hcs_parser/hcs_generate_tree.c", + "$hdf_fwk_path/utils/src/hcs_parser/hcs_parser.c", + "$hdf_fwk_path/utils/src/hcs_parser/hcs_tree_if.c", "$hdf_fwk_path/utils/src/hdf_cstring.c", "$hdf_fwk_path/utils/src/hdf_map.c", + "$hdf_fwk_path/utils/src/hdf_sbuf.c", + "$hdf_fwk_path/utils/src/hdf_sbuf_impl_raw.c", "$hdf_fwk_path/utils/src/hdf_slist.c", "$hdf_fwk_path/utils/src/hdf_sref.c", "common/src/devmgr_service_start.c", diff --git a/khdf/liteos_m/platform/BUILD.gn b/khdf/liteos_m/platform/BUILD.gn index 9c2625b..3e61861 100644 --- a/khdf/liteos_m/platform/BUILD.gn +++ b/khdf/liteos_m/platform/BUILD.gn @@ -43,9 +43,9 @@ static_library("hdf_platform_lite") { "$hdf_fwk_path/support/platform/src/gpio_if.c", "$hdf_fwk_path/support/platform/src/i2c_core.c", "$hdf_fwk_path/support/platform/src/i2c_if.c", + "$hdf_fwk_path/support/platform/src/pwm_core.c", "$hdf_fwk_path/support/platform/src/uart_core.c", "$hdf_fwk_path/support/platform/src/uart_if.c", - "$hdf_fwk_path/support/platform/src/pwm_core.c", "plat_common.c", ] include_dirs = [ "kernel/liteos_m/kernel/arch/include" ] diff --git a/uhdf/manager/BUILD.gn b/uhdf/manager/BUILD.gn index 34fbdbe..2413f14 100755 --- a/uhdf/manager/BUILD.gn +++ b/uhdf/manager/BUILD.gn @@ -17,11 +17,11 @@ HDF_FRAMEWORKS = "//drivers/framework" shared_library("hdf_core") { sources = [ - "$HDF_FRAMEWORKS/ability/sbuf/src/hdf_sbuf.c", - "$HDF_FRAMEWORKS/ability/sbuf/src/hdf_sbuf_impl_raw.c", "$HDF_FRAMEWORKS/core/adapter/syscall/src/hdf_devmgr_adapter.c", "$HDF_FRAMEWORKS/core/adapter/syscall/src/hdf_syscall_adapter.c", "$HDF_FRAMEWORKS/core/shared/src/hdf_io_service.c", + "$HDF_FRAMEWORKS/utils/src/hdf_sbuf.c", + "$HDF_FRAMEWORKS/utils/src/hdf_sbuf_impl_raw.c", ] include_dirs = [ @@ -30,7 +30,6 @@ shared_library("hdf_core") { "$HDF_FRAMEWORKS/core/shared/include", "$HDF_FRAMEWORKS/core/host/include", "$HDF_FRAMEWORKS/core/manager/include", - "$HDF_FRAMEWORKS/ability/sbuf/include", "$HDF_FRAMEWORKS/include/core", "$HDF_FRAMEWORKS/include/utils", "$HDF_FRAMEWORKS/utils/include", diff --git a/uhdf/platform/BUILD.gn b/uhdf/platform/BUILD.gn index 31d818d..dfc4702 100755 --- a/uhdf/platform/BUILD.gn +++ b/uhdf/platform/BUILD.gn @@ -17,9 +17,9 @@ HDF_FRAMEWORKS = "//drivers/framework" shared_library("hdf_platform") { sources = [ - "$HDF_FRAMEWORKS/support/platform/src/mmc/mmc_if.c", - "$HDF_FRAMEWORKS/support/platform/src/mmc/emmc_if.c", "$HDF_FRAMEWORKS/support/platform/src/i2c_if.c", + "$HDF_FRAMEWORKS/support/platform/src/mmc/emmc_if.c", + "$HDF_FRAMEWORKS/support/platform/src/mmc/mmc_if.c", "$HDF_FRAMEWORKS/support/platform/src/uart_if.c", ] @@ -30,7 +30,6 @@ shared_library("hdf_platform") { "$HDF_FRAMEWORKS/include/osal", "$HDF_FRAMEWORKS/include/platform", "$HDF_FRAMEWORKS/../adapter/uhdf/posix/include", - "$HDF_FRAMEWORKS/ability/sbuf/include", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", ] diff --git a/uhdf/test/unittest/common/BUILD.gn b/uhdf/test/unittest/common/BUILD.gn index 1811972..6e68a90 100644 --- a/uhdf/test/unittest/common/BUILD.gn +++ b/uhdf/test/unittest/common/BUILD.gn @@ -16,7 +16,6 @@ shared_library("hdf_test_common") { include_dirs = [ "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", diff --git a/uhdf/test/unittest/config/BUILD.gn b/uhdf/test/unittest/config/BUILD.gn index ca232ff..c8894b4 100644 --- a/uhdf/test/unittest/config/BUILD.gn +++ b/uhdf/test/unittest/config/BUILD.gn @@ -19,19 +19,17 @@ unittest("hdf_adapter_uhdf_test_config") { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//base/hiviewdfx/hilog_lite/interfaces/native/innerkits", ] - sources = [ "//drivers/framework/ability/config/test/unittest/common/hdf_config_test.cpp" ] + sources = [ "//drivers/framework/utils/src/hcs_parser/test/unittest/common/hdf_config_test.cpp" ] deps = [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//drivers/adapter/uhdf/manager:hdf_core", diff --git a/uhdf/test/unittest/manager/BUILD.gn b/uhdf/test/unittest/manager/BUILD.gn index af06e5a..b27f617 100644 --- a/uhdf/test/unittest/manager/BUILD.gn +++ b/uhdf/test/unittest/manager/BUILD.gn @@ -19,7 +19,7 @@ unittest("hdf_adapter_uhdf_test_manager") { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", + "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/core/common/include/host", @@ -27,7 +27,6 @@ unittest("hdf_adapter_uhdf_test_manager") { "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/manager", @@ -59,7 +58,6 @@ unittest("hdf_adapter_uhdf_test_ioservice") { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/core/common/include/host", @@ -67,7 +65,6 @@ unittest("hdf_adapter_uhdf_test_ioservice") { "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/manager", @@ -99,7 +96,6 @@ unittest("hdf_adapter_uhdf_test_sbuf") { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", @@ -136,7 +132,6 @@ unittest("hdf_adapter_uhdf_test_door") { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/core/common/include/host", @@ -144,7 +139,6 @@ unittest("hdf_adapter_uhdf_test_door") { "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/manager", diff --git a/uhdf/test/unittest/osal/BUILD.gn b/uhdf/test/unittest/osal/BUILD.gn index 8c63583..47e4a56 100644 --- a/uhdf/test/unittest/osal/BUILD.gn +++ b/uhdf/test/unittest/osal/BUILD.gn @@ -19,13 +19,11 @@ unittest("hdf_adapter_uhdf_test_osal") { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/osal", @@ -59,13 +57,11 @@ unittest("hdf_adapter_uhdf_test_osal_posix") { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/osal", diff --git a/uhdf/test/unittest/platform/BUILD.gn b/uhdf/test/unittest/platform/BUILD.gn index 881e753..3e35855 100644 --- a/uhdf/test/unittest/platform/BUILD.gn +++ b/uhdf/test/unittest/platform/BUILD.gn @@ -20,13 +20,11 @@ if (board_name == "hi3516dv300" || board_name == "hispark_taurus") { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/platform/common", @@ -82,13 +80,11 @@ if (board_name == "hi3516dv300" || board_name == "hispark_taurus") { include_dirs = [ "//third_party/googletest/googletest/include", "//third_party/bounds_checking_function/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/platform/common", diff --git a/uhdf2/config/BUILD.gn b/uhdf2/config/BUILD.gn deleted file mode 100644 index 76920c2..0000000 --- a/uhdf2/config/BUILD.gn +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/ohos.gni") -import("//drivers/adapter/uhdf2/uhdf.gni") - -group("uhdf_hcs_pkg") { - deps = [ ":libhdf_hcs" ] -} - -ohos_shared_library("libhdf_hcs") { - include_dirs = [ - "$hdf_uhdf_path/config/include", - "$hdf_uhdf_path/include/config", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - ] - sources = [ - "$hdf_framework_path/ability/config/device_resource_if.c", - "$hdf_framework_path/ability/config/hcs_parser/src/hcs_blob_if.c", - "$hdf_framework_path/ability/config/hcs_parser/src/hcs_generate_tree.c", - "$hdf_framework_path/ability/config/hcs_parser/src/hcs_parser.c", - "$hdf_framework_path/ability/config/hcs_parser/src/hcs_tree_if.c", - "$hdf_uhdf_path/config/src/hcs_blob_load.c", - "$hdf_uhdf_path/config/src/hcs_dm_parser.c", - ] - - deps = [ - "$hdf_uhdf_path/osal:libhdf_utils", - "//utils/native/base:utils", - ] - - if (is_standard_system) { - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - } else { - external_deps = [ "hilog:libhilog" ] - } - - cflags = [ - "-Wall", - "-Wextra", - "-Werror", - ] - - # install_images = [ "vendor" ] - subsystem_name = "hdf" - part_name = "hdf" -} diff --git a/uhdf2/hdi/BUILD.gn b/uhdf2/hdi/BUILD.gn index 75e39ef..f097eb1 100644 --- a/uhdf2/hdi/BUILD.gn +++ b/uhdf2/hdi/BUILD.gn @@ -22,7 +22,7 @@ config("libhdi_pub_config") { include_dirs = [ "//utils/native/base/include", - "$hdf_framework_path/ability/sbuf/include", + "$hdf_framework_path/utils/include", "$hdf_uhdf_path/ipc/include", "$hdf_uhdf_path/hdi/include", "$hdf_uhdf_path/include/hdi", @@ -32,12 +32,7 @@ config("libhdi_pub_config") { ohos_shared_library("libhdi") { include_dirs = [ - "$hdf_framework_path/include", - "$hdf_framework_path/include/core", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", "$hdf_framework_path/core/sec/include", - "$hdf_framework_path/utils/include", "$hdf_framework_path/core/shared/include", "$hdf_framework_path/core/host/include", "$hdf_framework_path/core/manager/include", @@ -58,7 +53,7 @@ ohos_shared_library("libhdi") { deps = [ "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/uhdf2/hdi/test/BUILD.gn b/uhdf2/hdi/test/BUILD.gn index 442f3da..420b07a 100644 --- a/uhdf2/hdi/test/BUILD.gn +++ b/uhdf2/hdi/test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("HdiServiceManagerTest") { deps = [ "$hdf_uhdf_path/hdi:libhdi", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -46,7 +46,7 @@ ohos_unittest("HdiServiceManagerTestCC") { deps = [ "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/uhdf2/hdi/test/hdi_sample/sample_client_c/unittest/BUILD.gn b/uhdf2/hdi/test/hdi_sample/sample_client_c/unittest/BUILD.gn index fdd5125..d1ad356 100644 --- a/uhdf2/hdi/test/hdi_sample/sample_client_c/unittest/BUILD.gn +++ b/uhdf2/hdi/test/hdi_sample/sample_client_c/unittest/BUILD.gn @@ -19,7 +19,6 @@ group("sample_client_c") { ohos_shared_library("libsample_client_c") { include_dirs = [ - "$hdf_framework_path/ability/sbuf/include", "$hdf_uhdf_path/manager/include", "$hdf_uhdf_path/include/hdi", ] @@ -30,7 +29,7 @@ ohos_shared_library("libsample_client_c") { "$hdf_uhdf_path/hdi:libhdi", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", ] if (is_standard_system) { diff --git a/uhdf2/hdi/test/hdi_sample/sample_client_cpp/unittest/BUILD.gn b/uhdf2/hdi/test/hdi_sample/sample_client_cpp/unittest/BUILD.gn index 8a1287d..a5c3815 100644 --- a/uhdf2/hdi/test/hdi_sample/sample_client_cpp/unittest/BUILD.gn +++ b/uhdf2/hdi/test/hdi_sample/sample_client_cpp/unittest/BUILD.gn @@ -19,7 +19,6 @@ group("sample_client_cpp") { ohos_shared_library("libsample_client_cpp") { include_dirs = [ - "$hdf_framework_path/ability/sbuf/include", "$hdf_uhdf_path/manager/include", "$hdf_uhdf_path/include/hdi", ] @@ -30,7 +29,7 @@ ohos_shared_library("libsample_client_cpp") { "$hdf_uhdf_path/hdi:libhdi", "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/uhdf2/hdi/test/hdi_sample/sample_service_c/BUILD.gn b/uhdf2/hdi/test/hdi_sample/sample_service_c/BUILD.gn index c88ef28..43234ae 100644 --- a/uhdf2/hdi/test/hdi_sample/sample_service_c/BUILD.gn +++ b/uhdf2/hdi/test/hdi_sample/sample_service_c/BUILD.gn @@ -27,7 +27,7 @@ ohos_shared_library("libsample_service_c") { deps = [ "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/uhdf2/hdi/test/hdi_sample/sample_service_cpp/BUILD.gn b/uhdf2/hdi/test/hdi_sample/sample_service_cpp/BUILD.gn index 4bbda39..7bba8ba 100644 --- a/uhdf2/hdi/test/hdi_sample/sample_service_cpp/BUILD.gn +++ b/uhdf2/hdi/test/hdi_sample/sample_service_cpp/BUILD.gn @@ -27,7 +27,7 @@ ohos_shared_library("libsample_service_cpp") { deps = [ "//drivers/adapter/uhdf2/host:libhdf_host", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/uhdf2/host/BUILD.gn b/uhdf2/host/BUILD.gn index 93e3367..b96103b 100755 --- a/uhdf2/host/BUILD.gn +++ b/uhdf2/host/BUILD.gn @@ -22,13 +22,6 @@ config("libhdf_host_pub_config") { "$hdf_framework_path/core/manager/include", "$hdf_framework_path/core/host/include", "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/core", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", "$hdf_uhdf_path/include/host", "$hdf_uhdf_path/shared/include", "$hdf_uhdf_path/manager/include", @@ -43,18 +36,11 @@ ohos_shared_library("libhdf_host") { "$hdf_framework_path/core/manager/include", "$hdf_framework_path/core/host/include", "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/core", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", - "$hdf_uhdf_path/include/config", "$hdf_uhdf_path/include/host", "$hdf_uhdf_path/shared/include", "$hdf_uhdf_path/manager/include", "$hdf_uhdf_path/security/include", + "$hdf_uhdf_path/utils/include", "include", ] @@ -92,9 +78,8 @@ ohos_shared_library("libhdf_host") { ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] @@ -121,16 +106,8 @@ ohos_executable("hdf_devhost") { "$hdf_framework_path/core/manager/include", "$hdf_framework_path/core/host/include", "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/include/core", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", "$hdf_uhdf_path/ipc/include", "$hdf_uhdf_path/osal/include", - "$hdf_uhdf_path/include/config", "$hdf_uhdf_path/include/host", "$hdf_uhdf_path/shared/include", "$hdf_uhdf_path/manager/include", @@ -140,10 +117,9 @@ ohos_executable("hdf_devhost") { sources = [ "devhost.c" ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", "$hdf_uhdf_path/host:libhdf_host", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/uhdf2/host/test/BUILD.gn b/uhdf2/host/test/BUILD.gn index 157fbf9..2106f9c 100755 --- a/uhdf2/host/test/BUILD.gn +++ b/uhdf2/host/test/BUILD.gn @@ -33,8 +33,8 @@ ohos_unittest("DevMgrTest") { deps = [ "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", "$hdf_uhdf_path/host/test/unittest/sample_driver:sample_driver", + "$hdf_uhdf_path/utils:libhdf_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/uhdf2/host/test/unittest/sample_driver/BUILD.gn b/uhdf2/host/test/unittest/sample_driver/BUILD.gn index 9fb8343..46bc657 100644 --- a/uhdf2/host/test/unittest/sample_driver/BUILD.gn +++ b/uhdf2/host/test/unittest/sample_driver/BUILD.gn @@ -20,14 +20,14 @@ group("sample_driver") { ohos_shared_library("libsample_driver") { sources = [ "sample_driver.c", - "sample_hdi_service_stub.c", "sample_hdi_service.c", + "sample_hdi_service_stub.c", ] deps = [ - "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//drivers/adapter/uhdf2/osal:libhdf_utils", "//drivers/adapter/uhdf2/host:libhdf_host", + "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/uhdf2/ipc/BUILD.gn b/uhdf2/ipc/BUILD.gn index 9029981..23fc47a 100644 --- a/uhdf2/ipc/BUILD.gn +++ b/uhdf2/ipc/BUILD.gn @@ -23,7 +23,6 @@ config("libhdf_ipc_adapter_pub_config") { "//drivers/framework/include/osal", "//drivers/framework/include/utils", "//drivers/framework/utils/include", - "//drivers/framework/ability/sbuf/include", "//drivers/framework/core/adapter/syscall/include", "//drivers/framework/core/adapter/vnode/include", "//drivers/framework/core/shared/include", @@ -48,7 +47,7 @@ ohos_shared_library("libhdf_ipc_adapter") { ] deps = [ - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/uhdf2/manager/BUILD.gn b/uhdf2/manager/BUILD.gn index 02945e7..aefd870 100644 --- a/uhdf2/manager/BUILD.gn +++ b/uhdf2/manager/BUILD.gn @@ -21,23 +21,16 @@ ohos_executable("hdf_devmgr") { "$hdf_framework_path/core/common/include/manager/", "$hdf_framework_path/core/host/include", "$hdf_framework_path/core/shared/include", - "$hdf_framework_path/include/osal", - "$hdf_framework_path/include/utils", - "$hdf_framework_path/utils/include", - "$hdf_framework_path/include/core", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/sbuf/include", - "$hdf_framework_path/ability/config/hcs_parser/include", "$hdf_framework_path/model/usb/include", "$hdf_uhdf_path/ipc/include", "$hdf_uhdf_path/osal/include/", - "$hdf_uhdf_path/include/config", "$hdf_uhdf_path/include/osal", "$hdf_uhdf_path/include/host", "$hdf_uhdf_path/shared/include", "$hdf_uhdf_path/manager/include", "$hdf_uhdf_path/host/include", "$hdf_uhdf_path/security/include", + "$hdf_uhdf_path/utils/include", "include", ] @@ -71,9 +64,8 @@ ohos_executable("hdf_devmgr") { ] deps = [ - "$hdf_uhdf_path/config:uhdf_hcs_pkg", "$hdf_uhdf_path/ipc:libhdf_ipc_adapter", - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/uhdf2/ohos.build b/uhdf2/ohos.build index d0130f0..a4217e3 100644 --- a/uhdf2/ohos.build +++ b/uhdf2/ohos.build @@ -3,14 +3,13 @@ "parts": { "hdf": { "module_list": [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/adapter/uhdf2/hdi:libhdi", "//drivers/adapter/uhdf2/manager:hdf_devmgr", "//drivers/adapter/uhdf2/manager:hdf_devmgr.rc", "//drivers/adapter/uhdf2/host:hdf_devhost", "//drivers/adapter/uhdf2/host:libhdf_host", - "//drivers/adapter/uhdf2/config:libhdf_hcs", "//drivers/adapter/uhdf2/host/test/unittest/sample_driver:libsample_driver", "//drivers/adapter/uhdf2/hcs:hdf_default.hcb", "//drivers/peripheral/input/hal:hdi_input", diff --git a/uhdf2/osal/BUILD.gn b/uhdf2/osal/BUILD.gn index 0b39943..91a9f6b 100644 --- a/uhdf2/osal/BUILD.gn +++ b/uhdf2/osal/BUILD.gn @@ -28,7 +28,6 @@ config("libhdf_utils_pub_config") { "$hdf_framework_path/include/osal", "$hdf_framework_path/include/utils", "$hdf_framework_path/utils/include", - "$hdf_framework_path/ability/sbuf/include", "$hdf_framework_path/core/adapter/syscall/include", "$hdf_framework_path/core/adapter/vnode/include", "$hdf_framework_path/core/shared/include", @@ -66,7 +65,7 @@ ohos_shared_library("libhdf_utils") { "$hdf_framework_path/utils/src/hdf_thread_ex.c", "$hdf_framework_path/utils/src/osal_message.c", "$hdf_framework_path/utils/src/osal_msg_queue.c", - "osal_sysevent.c", + "src/osal_sysevent.c", ] deps = [ "//utils/native/base:utils" ] diff --git a/uhdf2/osal/osal_sysevent.c b/uhdf2/osal/src/osal_sysevent.c similarity index 100% rename from uhdf2/osal/osal_sysevent.c rename to uhdf2/osal/src/osal_sysevent.c diff --git a/uhdf2/osal/test/BUILD.gn b/uhdf2/osal/test/BUILD.gn index 2736e5c..a132ae2 100644 --- a/uhdf2/osal/test/BUILD.gn +++ b/uhdf2/osal/test/BUILD.gn @@ -30,7 +30,7 @@ ohos_unittest("OsalTest") { ] deps = [ - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -51,7 +51,7 @@ ohos_unittest("SbufTest") { ] deps = [ - "$hdf_uhdf_path/osal:libhdf_utils", + "$hdf_uhdf_path/utils:libhdf_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/uhdf2/security/BUILD.gn b/uhdf2/security/BUILD.gn index 4bf2077..ba89686 100644 --- a/uhdf2/security/BUILD.gn +++ b/uhdf2/security/BUILD.gn @@ -26,17 +26,14 @@ ohos_shared_library("libhdf_sec") { "//drivers/framework/core/sec/include", "//drivers/framework/include/platform", "$hdf_uhdf_path/security/include", - "$hdf_framework_path/include/config", - "$hdf_framework_path/ability/config/hcs_parser/include", ] sources = [ "src/hdf_security.c" ] deps = [ "$hdf_uhdf_path/hdi:libhdi", - "$hdf_uhdf_path/osal:libhdf_utils", "$hdf_uhdf_path/pal:libhdf_pal", - "$hdf_uhdf_path/config:libhdf_hcs", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/uhdf2/test/unittest/common/BUILD.gn b/uhdf2/test/unittest/common/BUILD.gn index 79f0c3f..4aff40b 100644 --- a/uhdf2/test/unittest/common/BUILD.gn +++ b/uhdf2/test/unittest/common/BUILD.gn @@ -27,7 +27,7 @@ ohos_shared_library("libhdf_test_common") { include_dirs = [ "//drivers/framework/test/unittest/include" ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] defines = [ "__OHOS__USER__" ] diff --git a/uhdf2/test/unittest/config/BUILD.gn b/uhdf2/test/unittest/config/BUILD.gn index c0146f1..356703a 100644 --- a/uhdf2/test/unittest/config/BUILD.gn +++ b/uhdf2/test/unittest/config/BUILD.gn @@ -19,7 +19,7 @@ ohos_unittest("hdf_adapter_uhdf_test_config") { module_out_path = module_output_path include_dirs = [ "//drivers/framework/test/unittest/include" ] - sources = [ "//drivers/framework/ability/config/test/unittest/common/hdf_config_test.cpp" ] + sources = [ "//drivers/framework/utils/src/hcs_parser/test/unittest/common/hdf_config_test.cpp" ] cflags = [ "-Wall", "-Wextra", @@ -29,8 +29,8 @@ ohos_unittest("hdf_adapter_uhdf_test_config") { "-fno-strict-aliasing", ] deps = [ - "$hdf_uhdf_path/osal:libhdf_utils", "$hdf_uhdf_path/test/unittest/common:libhdf_test_common", + "$hdf_uhdf_path/utils:libhdf_utils", "//utils/native/base:utils", ] if (is_standard_system) { diff --git a/uhdf2/test/unittest/manager/BUILD.gn b/uhdf2/test/unittest/manager/BUILD.gn index df28696..2f26819 100644 --- a/uhdf2/test/unittest/manager/BUILD.gn +++ b/uhdf2/test/unittest/manager/BUILD.gn @@ -17,14 +17,12 @@ module_output_path = "hdf/manager" ohos_unittest("hdf_adapter_uhdf_test_manager") { module_out_path = module_output_path include_dirs = [ - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/core/common/include/host", "//drivers/framework/core/shared/include", "//drivers/framework/include/osal", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/manager", @@ -33,8 +31,8 @@ ohos_unittest("hdf_adapter_uhdf_test_manager") { defines = [ "__USER__" ] sources = [ "//drivers/framework/core/manager/test/unittest/common/hdf_lite_manager_test.cpp" ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", "//drivers/adapter/uhdf2/test/unittest/common:libhdf_test_common", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] cflags = [ @@ -56,14 +54,12 @@ module_output_path = "hdf/ioservice" ohos_unittest("hdf_adapter_uhdf_test_ioservice") { module_out_path = module_output_path include_dirs = [ - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/core/common/include/host", "//drivers/framework/core/shared/include", "//drivers/framework/include/osal", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/manager", @@ -72,7 +68,7 @@ ohos_unittest("hdf_adapter_uhdf_test_ioservice") { defines = [ "__USER__" ] sources = [ "//drivers/framework/core/manager/test/unittest/common/hdf_ioservice_test.cpp" ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] cflags = [ @@ -93,7 +89,6 @@ module_output_path = "hdf/sbuf" ohos_unittest("hdf_adapter_uhdf_test_sbuf") { module_out_path = module_output_path include_dirs = [ - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/osal", "//drivers/framework/include/utils", "//drivers/framework/include", @@ -106,7 +101,7 @@ ohos_unittest("hdf_adapter_uhdf_test_sbuf") { "//drivers/framework/core/manager/test/unittest/common/hdf_sbuf_test.cpp", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] cflags = [ diff --git a/uhdf2/test/unittest/osal/BUILD.gn b/uhdf2/test/unittest/osal/BUILD.gn index 4fb4edd..af280a1 100644 --- a/uhdf2/test/unittest/osal/BUILD.gn +++ b/uhdf2/test/unittest/osal/BUILD.gn @@ -18,13 +18,11 @@ ohos_unittest("hdf_adapter_uhdf_test_osal") { module_out_path = module_output_path include_dirs = [ - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/osal", @@ -35,8 +33,8 @@ ohos_unittest("hdf_adapter_uhdf_test_osal") { "//drivers/framework/support/posix/test/unittest/common/hdf_osal_test.cpp", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", "//drivers/adapter/uhdf2/test/unittest/common:libhdf_test_common", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] @@ -59,13 +57,11 @@ ohos_unittest("hdf_adapter_uhdf_test_osal_posix") { module_out_path = module_output_path include_dirs = [ - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/osal", @@ -79,7 +75,7 @@ ohos_unittest("hdf_adapter_uhdf_test_osal_posix") { "//drivers/framework/test/unittest/osal/osal_list_test.c", ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] diff --git a/uhdf2/test/unittest/platform/BUILD.gn b/uhdf2/test/unittest/platform/BUILD.gn index 5765133..fedc9db 100644 --- a/uhdf2/test/unittest/platform/BUILD.gn +++ b/uhdf2/test/unittest/platform/BUILD.gn @@ -17,13 +17,11 @@ module_output_path = "hdf/platform" ohos_unittest("hdf_adapter_uhdf_test_platform") { module_out_path = module_output_path include_dirs = [ - "//drivers/framework/ability/sbuf/include", "//drivers/framework/include/platform", "//drivers/framework/include/core", "//drivers/framework/include/osal", "//drivers/adapter/uhdf/posix/include", "//drivers/framework/include/utils", - "//drivers/framework/include/config", "//drivers/framework/include", "//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/platform/common", @@ -42,8 +40,8 @@ ohos_unittest("hdf_adapter_uhdf_test_platform") { ] deps = [ - "//drivers/adapter/uhdf2/osal:libhdf_utils", "//drivers/adapter/uhdf2/test/unittest/common:libhdf_test_common", + "//drivers/adapter/uhdf2/utils:libhdf_utils", "//utils/native/base:utils", ] cflags = [ diff --git a/uhdf2/utils/BUILD.gn b/uhdf2/utils/BUILD.gn new file mode 100644 index 0000000..9e9bfdc --- /dev/null +++ b/uhdf2/utils/BUILD.gn @@ -0,0 +1,99 @@ +# Copyright (c) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") +import("//drivers/adapter/uhdf2/uhdf.gni") + +group("uhdf_utils_pkg") { + deps = [ ":libhdf_utils" ] +} + +config("libhdf_utils_pub_config") { + visibility = [ ":*" ] + + include_dirs = [ + "//utils/native/base/include", + "$hdf_framework_path/include", + "$hdf_framework_path/include/core", + "$hdf_framework_path/include/osal", + "$hdf_framework_path/include/utils", + "$hdf_framework_path/utils/include", + "$hdf_framework_path/core/adapter/syscall/include", + "$hdf_framework_path/core/adapter/vnode/include", + "$hdf_framework_path/core/shared/include", + "$hdf_framework_path/include/core/", + "$hdf_uhdf_path/osal/include", + "$hdf_uhdf_path/utils/include", + ] + defines = [ "__OHOS_USER__" ] + + if (is_standard_system) { + defines += [ "__OHOS_STANDARD_SYS__" ] + } +} + +ohos_shared_library("libhdf_utils") { + public_configs = [ ":libhdf_utils_pub_config" ] + sources = [ + "$hdf_framework_path/core/adapter/syscall/src/hdf_devmgr_adapter.c", + "$hdf_framework_path/core/adapter/syscall/src/hdf_syscall_adapter.c", + "$hdf_framework_path/core/shared/src/hdf_io_service.c", + "$hdf_framework_path/support/posix/src/osal_mem.c", + "$hdf_framework_path/support/posix/src/osal_mutex.c", + "$hdf_framework_path/support/posix/src/osal_sem.c", + "$hdf_framework_path/support/posix/src/osal_spinlock.c", + "$hdf_framework_path/support/posix/src/osal_thread.c", + "$hdf_framework_path/support/posix/src/osal_time.c", + "$hdf_framework_path/utils/src/hcs_parser/device_resource_if.c", + "$hdf_framework_path/utils/src/hcs_parser/hcs_blob_if.c", + "$hdf_framework_path/utils/src/hcs_parser/hcs_generate_tree.c", + "$hdf_framework_path/utils/src/hcs_parser/hcs_parser.c", + "$hdf_framework_path/utils/src/hcs_parser/hcs_tree_if.c", + "$hdf_framework_path/utils/src/hdf_cstring.c", + "$hdf_framework_path/utils/src/hdf_map.c", + "$hdf_framework_path/utils/src/hdf_message_looper.c", + "$hdf_framework_path/utils/src/hdf_message_task.c", + "$hdf_framework_path/utils/src/hdf_sbuf.c", + "$hdf_framework_path/utils/src/hdf_sbuf_impl_raw.c", + "$hdf_framework_path/utils/src/hdf_slist.c", + "$hdf_framework_path/utils/src/hdf_sref.c", + "$hdf_framework_path/utils/src/hdf_thread_ex.c", + "$hdf_framework_path/utils/src/osal_message.c", + "$hdf_framework_path/utils/src/osal_msg_queue.c", + "$hdf_uhdf_path/osal/src/osal_sysevent.c", + "$hdf_uhdf_path/utils/src/hcs_parser/hcs_blob_load.c", + "$hdf_uhdf_path/utils/src/hcs_parser/hcs_dm_parser.c", + ] + + deps = [ "//utils/native/base:utils" ] + + if (is_standard_system) { + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + } else { + external_deps = [ "hilog:libhilog" ] + } + + cflags = [ + "-Wall", + "-Wextra", + "-Werror", + ] + + # install_images = [ "vendor" ] + subsystem_name = "hdf" + part_name = "hdf" + install_images = [ + "system", + "updater", + ] +} diff --git a/uhdf2/include/config/hcs_dm_parser.h b/uhdf2/utils/include/hcs_dm_parser.h similarity index 100% rename from uhdf2/include/config/hcs_dm_parser.h rename to uhdf2/utils/include/hcs_dm_parser.h diff --git a/uhdf2/config/src/hcs_blob_load.c b/uhdf2/utils/src/hcs_parser/hcs_blob_load.c similarity index 100% rename from uhdf2/config/src/hcs_blob_load.c rename to uhdf2/utils/src/hcs_parser/hcs_blob_load.c diff --git a/uhdf2/config/include/hcs_blob_load.h b/uhdf2/utils/src/hcs_parser/hcs_blob_load.h similarity index 100% rename from uhdf2/config/include/hcs_blob_load.h rename to uhdf2/utils/src/hcs_parser/hcs_blob_load.h diff --git a/uhdf2/config/src/hcs_dm_parser.c b/uhdf2/utils/src/hcs_parser/hcs_dm_parser.c similarity index 100% rename from uhdf2/config/src/hcs_dm_parser.c rename to uhdf2/utils/src/hcs_parser/hcs_dm_parser.c -- Gitee