From f36c1e154e6ebd6bb170569a749bdc5ce09da926 Mon Sep 17 00:00:00 2001 From: yuanbo Date: Tue, 28 Sep 2021 16:19:08 +0800 Subject: [PATCH] optimize hdf utils dirs Signed-off-by: yuanbo --- include/{config => utils}/device_resource_if.h | 0 {ability/sbuf/include => include/utils}/hdf_sbuf.h | 0 test/unittest/common/hdf_main_test.c | 2 +- .../config => utils}/hcs_parser/unittest/hcs_config_test.c | 0 .../config => utils}/hcs_parser/unittest/hcs_config_test.h | 0 .../hcs_parser/unittest/hcs_parser_test.c} | 2 +- .../hcs_parser/unittest/hcs_parser_test.h} | 6 +++--- {ability/config/hcs_parser => utils}/include/hcs_blob_if.h | 0 {ability/config/hcs_parser => utils}/include/hcs_parser.h | 0 {ability/config/hcs_parser => utils}/include/hcs_tree_if.h | 0 {ability/sbuf => utils}/include/hdf_sbuf_impl.h | 0 .../config => utils/src/hcs_parser}/device_resource_if.c | 0 .../hcs_parser/src => utils/src/hcs_parser}/hcs_blob_if.c | 0 .../src => utils/src/hcs_parser}/hcs_generate_tree.c | 0 .../include => utils/src/hcs_parser}/hcs_generate_tree.h | 0 .../hcs_parser/src => utils/src/hcs_parser}/hcs_parser.c | 0 .../hcs_parser/src => utils/src/hcs_parser}/hcs_tree_if.c | 0 .../hcs_parser}/test/unittest/common/hdf_config_test.cpp | 0 {ability/sbuf => utils}/src/hdf_sbuf.c | 0 {ability/sbuf => utils}/src/hdf_sbuf_impl_raw.c | 0 20 files changed, 5 insertions(+), 5 deletions(-) rename include/{config => utils}/device_resource_if.h (100%) rename {ability/sbuf/include => include/utils}/hdf_sbuf.h (100%) rename test/unittest/{ability/config => utils}/hcs_parser/unittest/hcs_config_test.c (100%) rename test/unittest/{ability/config => utils}/hcs_parser/unittest/hcs_config_test.h (100%) rename test/unittest/{config/hdf_config_test.c => utils/hcs_parser/unittest/hcs_parser_test.c} (99%) rename test/unittest/{config/hdf_config_test.h => utils/hcs_parser/unittest/hcs_parser_test.h} (95%) rename {ability/config/hcs_parser => utils}/include/hcs_blob_if.h (100%) rename {ability/config/hcs_parser => utils}/include/hcs_parser.h (100%) rename {ability/config/hcs_parser => utils}/include/hcs_tree_if.h (100%) rename {ability/sbuf => utils}/include/hdf_sbuf_impl.h (100%) rename {ability/config => utils/src/hcs_parser}/device_resource_if.c (100%) rename {ability/config/hcs_parser/src => utils/src/hcs_parser}/hcs_blob_if.c (100%) rename {ability/config/hcs_parser/src => utils/src/hcs_parser}/hcs_generate_tree.c (100%) rename {ability/config/hcs_parser/include => utils/src/hcs_parser}/hcs_generate_tree.h (100%) rename {ability/config/hcs_parser/src => utils/src/hcs_parser}/hcs_parser.c (100%) rename {ability/config/hcs_parser/src => utils/src/hcs_parser}/hcs_tree_if.c (100%) rename {ability/config => utils/src/hcs_parser}/test/unittest/common/hdf_config_test.cpp (100%) rename {ability/sbuf => utils}/src/hdf_sbuf.c (100%) rename {ability/sbuf => utils}/src/hdf_sbuf_impl_raw.c (100%) diff --git a/include/config/device_resource_if.h b/include/utils/device_resource_if.h similarity index 100% rename from include/config/device_resource_if.h rename to include/utils/device_resource_if.h diff --git a/ability/sbuf/include/hdf_sbuf.h b/include/utils/hdf_sbuf.h similarity index 100% rename from ability/sbuf/include/hdf_sbuf.h rename to include/utils/hdf_sbuf.h diff --git a/test/unittest/common/hdf_main_test.c b/test/unittest/common/hdf_main_test.c index d7931a49e..c803bd8c1 100644 --- a/test/unittest/common/hdf_main_test.c +++ b/test/unittest/common/hdf_main_test.c @@ -8,7 +8,7 @@ #include "hdf_log.h" #include "hdf_base.h" -#include "hdf_config_test.h" +#include "hcs_parser_test.h" #include "hdf_device_desc.h" #include "hdf_main_test.h" #include "osal_test_entry.h" diff --git a/test/unittest/ability/config/hcs_parser/unittest/hcs_config_test.c b/test/unittest/utils/hcs_parser/unittest/hcs_config_test.c similarity index 100% rename from test/unittest/ability/config/hcs_parser/unittest/hcs_config_test.c rename to test/unittest/utils/hcs_parser/unittest/hcs_config_test.c diff --git a/test/unittest/ability/config/hcs_parser/unittest/hcs_config_test.h b/test/unittest/utils/hcs_parser/unittest/hcs_config_test.h similarity index 100% rename from test/unittest/ability/config/hcs_parser/unittest/hcs_config_test.h rename to test/unittest/utils/hcs_parser/unittest/hcs_config_test.h diff --git a/test/unittest/config/hdf_config_test.c b/test/unittest/utils/hcs_parser/unittest/hcs_parser_test.c similarity index 99% rename from test/unittest/config/hdf_config_test.c rename to test/unittest/utils/hcs_parser/unittest/hcs_parser_test.c index 7cf001db6..c41032459 100644 --- a/test/unittest/config/hdf_config_test.c +++ b/test/unittest/utils/hcs_parser/unittest/hcs_parser_test.c @@ -6,7 +6,7 @@ * See the LICENSE file in the root of this repository for complete details. */ -#include "hdf_config_test.h" +#include "hcs_parser_test.h" #include "device_resource_if.h" #include "hcs_config_test.h" #include "hdf_base.h" diff --git a/test/unittest/config/hdf_config_test.h b/test/unittest/utils/hcs_parser/unittest/hcs_parser_test.h similarity index 95% rename from test/unittest/config/hdf_config_test.h rename to test/unittest/utils/hcs_parser/unittest/hcs_parser_test.h index 8c7193001..da78c08b8 100644 --- a/test/unittest/config/hdf_config_test.h +++ b/test/unittest/utils/hcs_parser/unittest/hcs_parser_test.h @@ -6,8 +6,8 @@ * See the LICENSE file in the root of this repository for complete details. */ -#ifndef HDF_CONFIG_TEST_H -#define HDF_CONFIG_TEST_H +#ifndef HCS_PARSER_TEST_H +#define HCS_PARSER_TEST_H #include "hdf_main_test.h" @@ -57,4 +57,4 @@ enum HdfConfigTestCaseCmd { int32_t HdfConfigEntry(HdfTestMsg *msg); -#endif // HDF_CONFIG_TEST_H +#endif // HCS_PARSER_TEST_H diff --git a/ability/config/hcs_parser/include/hcs_blob_if.h b/utils/include/hcs_blob_if.h similarity index 100% rename from ability/config/hcs_parser/include/hcs_blob_if.h rename to utils/include/hcs_blob_if.h diff --git a/ability/config/hcs_parser/include/hcs_parser.h b/utils/include/hcs_parser.h similarity index 100% rename from ability/config/hcs_parser/include/hcs_parser.h rename to utils/include/hcs_parser.h diff --git a/ability/config/hcs_parser/include/hcs_tree_if.h b/utils/include/hcs_tree_if.h similarity index 100% rename from ability/config/hcs_parser/include/hcs_tree_if.h rename to utils/include/hcs_tree_if.h diff --git a/ability/sbuf/include/hdf_sbuf_impl.h b/utils/include/hdf_sbuf_impl.h similarity index 100% rename from ability/sbuf/include/hdf_sbuf_impl.h rename to utils/include/hdf_sbuf_impl.h diff --git a/ability/config/device_resource_if.c b/utils/src/hcs_parser/device_resource_if.c similarity index 100% rename from ability/config/device_resource_if.c rename to utils/src/hcs_parser/device_resource_if.c diff --git a/ability/config/hcs_parser/src/hcs_blob_if.c b/utils/src/hcs_parser/hcs_blob_if.c similarity index 100% rename from ability/config/hcs_parser/src/hcs_blob_if.c rename to utils/src/hcs_parser/hcs_blob_if.c diff --git a/ability/config/hcs_parser/src/hcs_generate_tree.c b/utils/src/hcs_parser/hcs_generate_tree.c similarity index 100% rename from ability/config/hcs_parser/src/hcs_generate_tree.c rename to utils/src/hcs_parser/hcs_generate_tree.c diff --git a/ability/config/hcs_parser/include/hcs_generate_tree.h b/utils/src/hcs_parser/hcs_generate_tree.h similarity index 100% rename from ability/config/hcs_parser/include/hcs_generate_tree.h rename to utils/src/hcs_parser/hcs_generate_tree.h diff --git a/ability/config/hcs_parser/src/hcs_parser.c b/utils/src/hcs_parser/hcs_parser.c similarity index 100% rename from ability/config/hcs_parser/src/hcs_parser.c rename to utils/src/hcs_parser/hcs_parser.c diff --git a/ability/config/hcs_parser/src/hcs_tree_if.c b/utils/src/hcs_parser/hcs_tree_if.c similarity index 100% rename from ability/config/hcs_parser/src/hcs_tree_if.c rename to utils/src/hcs_parser/hcs_tree_if.c diff --git a/ability/config/test/unittest/common/hdf_config_test.cpp b/utils/src/hcs_parser/test/unittest/common/hdf_config_test.cpp similarity index 100% rename from ability/config/test/unittest/common/hdf_config_test.cpp rename to utils/src/hcs_parser/test/unittest/common/hdf_config_test.cpp diff --git a/ability/sbuf/src/hdf_sbuf.c b/utils/src/hdf_sbuf.c similarity index 100% rename from ability/sbuf/src/hdf_sbuf.c rename to utils/src/hdf_sbuf.c diff --git a/ability/sbuf/src/hdf_sbuf_impl_raw.c b/utils/src/hdf_sbuf_impl_raw.c similarity index 100% rename from ability/sbuf/src/hdf_sbuf_impl_raw.c rename to utils/src/hdf_sbuf_impl_raw.c -- Gitee