!896 feat: normalize drivers framework component and repos

Merge pull request !896 from yuanbo/master

bsd/dev/usb/Makefile

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 include $(LITEOSTOPDIR)/config.mk
-include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/lite.mk
+include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/lite.mk
 
 MODULE_NAME := usb_base
 
@@ -122,13 +122,13 @@ LOCAL_SRCS += $(STORAGE_SRC)/umass.c
 endif
 
 ifeq ($(LOSCFG_DRIVERS_USB_HID_CLASS)_$(LOSCFG_DRIVERS_HDF_INPUT), y_y)
-LOCAL_FLAGS += -I$(LITEOSTOPDIR)/../../drivers/framework/model/input/driver \
-               -I$(LITEOSTOPDIR)/../../drivers/framework/include/core \
-               -I$(LITEOSTOPDIR)/../../drivers/framework/core/common/include/host \
-               -I$(LITEOSTOPDIR)/../../drivers/framework/utils \
-               -I$(LITEOSTOPDIR)/../../drivers/framework/osal \
-               -I$(LITEOSTOPDIR)/../../drivers/framework/ability/sbuf/include \
-               -I$(LITEOSTOPDIR)/../../drivers/framework/include/osal \
+LOCAL_FLAGS += -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/model/input/driver \
+               -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/include/core \
+               -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/core/common/include/host \
+               -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/utils \
+               -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/osal \
+               -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/ability/sbuf/include \
+               -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/include/osal \
                -I$(LITEOSTOPDIR)/../../third_party/FreeBSD/sys/dev/evdev
 
 LOCAL_SRCS += $(INPUT_SRC)/uhid.c  \

drivers/Kconfig

@@ -5,7 +5,7 @@ config DRIVERS
       Answer Y to enable LiteOS support driver.
 
 source "bsd/dev/usb/Kconfig"
-source "../../drivers/adapter/khdf/liteos/Kconfig"
+source "../../drivers/hdf_core/adapter/khdf/liteos/Kconfig"
 
 # Device driver Kconfig import
 source "$(DEVICE_PATH)/drivers/Kconfig"
@@ -17,5 +17,4 @@ source "drivers/char/video/Kconfig"
 source "drivers/char/trace/Kconfig"
 source "drivers/char/perf/Kconfig"
 
-source "../../drivers/liteos/tzdriver/Kconfig"
 source "../../drivers/liteos/hievent/Kconfig"

kernel/base/Makefile

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 include $(LITEOSTOPDIR)/config.mk
-include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/lite.mk
+include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/lite.mk
 
 MODULE_NAME := $(notdir $(shell pwd))
 

liteos.gni

@@ -31,7 +31,7 @@ import("$root_out_dir/config.gni")
 
 LITEOSTOPDIR = "//kernel/liteos_a"
 LITEOSTHIRDPARTY = "//third_party"
-HDFTOPDIR = "//drivers/adapter/khdf/liteos"
+HDFTOPDIR = "//drivers/hdf_core/adapter/khdf/liteos"
 
 ARCH = ""
 if (defined(LOSCFG_ARCH_ARM_AARCH32)) {

testsuites/kernel/src/osTest.c

@@ -454,7 +454,7 @@ VOID TestTaskEntry(VOID)
 #if (TEST_MODULE_CHECK == 1)
         for (int i = 0; i < g_modelNum - 1; i++) {
             if (g_executModelNum[i] != 0) {
-                dprintf("\nExecuted Model: %s, Executed Model_Num: %d ,failed_count: %d , sucess_count :%d",
+                dprintf("\nExecuted Model: %s, Executed Model_Num: %d ,failed_count: %d , success_count :%d",
                     g_strModule[i], g_executModelNum[i], g_failModelResult[i], g_passModelResult[i]);
             }
             for (int j = 0; j < g_failResult && j < 50; j++) { // 50

testsuites/unittest/extended/signal/full/signal_test_029.cpp

@@ -35,7 +35,7 @@ static int g_sigCount = 0;
 static void SigPrint(int signum)
 {
     g_sigCount++;
-    printf("signal receive sucess\n");
+    printf("signal receive success\n");
 }
 
 static UINT32 TestCase(VOID)
@@ -101,7 +101,7 @@ static UINT32 TestCase(VOID)
     sleep(1);
     ret = kill(pid, SIGUSR1);
     ICUNIT_ASSERT_EQUAL(ret, 0, ret);
-    printf("kill sucess\n");
+    printf("kill success\n");
     ret = waitpid(pid, &status, 0);
     ICUNIT_ASSERT_EQUAL(ret, pid, ret);
     ICUNIT_ASSERT_EQUAL(WEXITSTATUS(status), LOS_OK, WEXITSTATUS(status));

testsuites/unittest/extended/signal/full/signal_test_030.cpp

@@ -35,7 +35,7 @@ static int g_sigCount = 0;
 static void SigPrint(int sig)
 {
     g_sigCount++;
-    printf("signal receive sucess\n");
+    printf("signal receive success\n");
 }
 
 static UINT32 TestCase(VOID)
@@ -68,7 +68,7 @@ static UINT32 TestCase(VOID)
     sleep(1);
     ret = kill(pid, SIGUSR1);
     ICUNIT_ASSERT_EQUAL(ret, 0, ret);
-    printf("kill sucess\n");
+    printf("kill success\n");
     wait(&ret);
     ICUNIT_ASSERT_EQUAL(WEXITSTATUS(ret), LOS_OK, WEXITSTATUS(ret));
     return LOS_OK;

testsuites/unittest/extended/signal/full/signal_test_033.cpp

@@ -36,13 +36,13 @@ static int g_sigCount1 = 0;
 static void SigPrint(int sig)
 {
     g_sigCount++;
-    printf("signal receive sucess\n");
+    printf("signal receive success\n");
 }
 
 static void SigPrint1(int sig)
 {
     g_sigCount1++;
-    printf("signal receive sucess\n");
+    printf("signal receive success\n");
 }
 
 static UINT32 TestCase(VOID)

testsuites/unittest/extended/signal/full/signal_test_040.cpp

@@ -37,7 +37,7 @@ static void SigPrint(int sig)
 {
     (void)sig;
     g_sigCount++;
-    printf("signal receive sucess\n");
+    printf("signal receive success\cn");
 }
 
 static UINT32 TestCase(VOID)

testsuites/unittest/extended/signal/smoke/signal_test_032.cpp

@@ -36,7 +36,7 @@ static void SigPrint(int sig)
 {
     (void)sig;
     g_sigCount++;
-    printf("signal receive sucess\n");
+    printf("signal receive success\n");
 }
 
 static UINT32 TestCase(VOID)

tools/build/mk/los_config.mk

@@ -355,7 +355,7 @@ endif
 LITEOS_DRIVERS_BASE_PATH := $(LITEOSTOPDIR)/../../drivers/liteos
 ################################## Driver Option Begin #################################
 ifeq ($(LOSCFG_DRIVERS_HDF), y)
-include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/hdf_lite.mk
+include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/hdf_lite.mk
 endif
 
 ifeq ($(LOSCFG_DRIVERS_HIEVENT), y)