From 4fcbd2794984404b2d0d731bec35242a8eb632c5 Mon Sep 17 00:00:00 2001 From: zhumingxian Date: Mon, 23 May 2022 20:48:08 +0800 Subject: [PATCH] chore: fix some typos Signed-off-by: liuhui --- OAT.xml | 2 +- SmartL_E802/liteos_m/board/main.c | 2 +- arm_mps2_an386/liteos_m/board/main.c | 2 +- arm_mps3_an547/liteos_m/board/main.c | 2 +- arm_virt/liteos_a/board/os_adapt/os_adapt.c | 2 +- esp32/liteos_m/board/hals/driver/hal_watchdog.c | 12 ++++++------ esp32/liteos_m/board/hals/driver/hal_watchdog.h | 2 +- esp32/liteos_m/board/main.c | 2 +- riscv32_virt/liteos_m/board/main.c | 2 +- riscv32_virt/liteos_m/board/ui/fbdev.cpp | 6 +++--- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/OAT.xml b/OAT.xml index 19ee066..2dafb69 100644 --- a/OAT.xml +++ b/OAT.xml @@ -23,7 +23,7 @@ - + diff --git a/SmartL_E802/liteos_m/board/main.c b/SmartL_E802/liteos_m/board/main.c index 247c547..002b471 100644 --- a/SmartL_E802/liteos_m/board/main.c +++ b/SmartL_E802/liteos_m/board/main.c @@ -53,7 +53,7 @@ LITE_OS_SEC_TEXT_INIT int main(void) uart_early_init(); ret = LOS_KernelInit(); if (ret != LOS_OK) { - printf("Liteos kernel init failed! ERROR: 0x%x\n", ret); + printf("LiteOS kernel init failed! ERROR: 0x%x\n", ret); } FileSystemInit(); diff --git a/arm_mps2_an386/liteos_m/board/main.c b/arm_mps2_an386/liteos_m/board/main.c index 4f72f8c..b1d8f71 100644 --- a/arm_mps2_an386/liteos_m/board/main.c +++ b/arm_mps2_an386/liteos_m/board/main.c @@ -52,7 +52,7 @@ LITE_OS_SEC_TEXT_INIT int main(void) ret = LOS_KernelInit(); if (ret != LOS_OK) { - printf("Liteos kernel init failed! ERROR: 0x%x\n", ret); + printf("LiteOS kernel init failed! ERROR: 0x%x\n", ret); goto EXIT; } diff --git a/arm_mps3_an547/liteos_m/board/main.c b/arm_mps3_an547/liteos_m/board/main.c index 98bc403..ed4241d 100644 --- a/arm_mps3_an547/liteos_m/board/main.c +++ b/arm_mps3_an547/liteos_m/board/main.c @@ -63,7 +63,7 @@ LITE_OS_SEC_TEXT_INIT int main(void) ret = LOS_KernelInit(); if (ret != LOS_OK) { - printf("Liteos kernel init failed! ERROR: %u\n", ret); + printf("LiteOS kernel init failed! ERROR: %u\n", ret); goto EXIT; } diff --git a/arm_virt/liteos_a/board/os_adapt/os_adapt.c b/arm_virt/liteos_a/board/os_adapt/os_adapt.c index 335d86e..4bae33b 100644 --- a/arm_virt/liteos_a/board/os_adapt/os_adapt.c +++ b/arm_virt/liteos_a/board/os_adapt/os_adapt.c @@ -128,7 +128,7 @@ void SystemInit(void) #endif dprintf("OsUserInitProcess start ...\n"); if (OsUserInitProcess()) { - PRINT_ERR("Create user init process faialed!\n"); + PRINT_ERR("Create user init process failed!\n"); return; } dprintf("OsUserInitProcess end ...\n"); diff --git a/esp32/liteos_m/board/hals/driver/hal_watchdog.c b/esp32/liteos_m/board/hals/driver/hal_watchdog.c index bd6f81a..85a50fa 100644 --- a/esp32/liteos_m/board/hals/driver/hal_watchdog.c +++ b/esp32/liteos_m/board/hals/driver/hal_watchdog.c @@ -37,8 +37,8 @@ VOID WdtEnable(VOID) return; } - if (REG32_READ(RTC_WDT_PROTECT) != WDT_WRWITE_MASK) { - REG32_WRITE(RTC_WDT_PROTECT, WDT_WRWITE_MASK); + if (REG32_READ(RTC_WDT_PROTECT) != WDT_WRITE_MASK) { + REG32_WRITE(RTC_WDT_PROTECT, WDT_WRITE_MASK); } REG32_WRITE(RTC_WDT_FEED, (1 << RTC_CNTL_WDT_FEED)); @@ -52,8 +52,8 @@ VOID WdtEnable(VOID) VOID WdtDisable(VOID) { - if (REG32_READ(RTC_WDT_PROTECT) != WDT_WRWITE_MASK) { - REG32_WRITE(RTC_WDT_PROTECT, WDT_WRWITE_MASK); + if (REG32_READ(RTC_WDT_PROTECT) != WDT_WRITE_MASK) { + REG32_WRITE(RTC_WDT_PROTECT, WDT_WRITE_MASK); } REG32_WRITE(RTC_WDT_FEED, (1 << RTC_CNTL_WDT_FEED)); REG32_WRITE(RTC_WDT_CFG0, (0 << RTC_CNTL_WDT_STG0)); @@ -65,8 +65,8 @@ VOID WdtDisable(VOID) VOID WdtFeed(VOID) { - if (REG32_READ(RTC_WDT_PROTECT) != WDT_WRWITE_MASK) { - REG32_WRITE(RTC_WDT_PROTECT, WDT_WRWITE_MASK); + if (REG32_READ(RTC_WDT_PROTECT) != WDT_WRITE_MASK) { + REG32_WRITE(RTC_WDT_PROTECT, WDT_WRITE_MASK); } REG32_WRITE(RTC_WDT_FEED, (1 << RTC_CNTL_WDT_FEED)); REG32_WRITE(RTC_WDT_PROTECT, 0); diff --git a/esp32/liteos_m/board/hals/driver/hal_watchdog.h b/esp32/liteos_m/board/hals/driver/hal_watchdog.h index 380cb03..82438d5 100644 --- a/esp32/liteos_m/board/hals/driver/hal_watchdog.h +++ b/esp32/liteos_m/board/hals/driver/hal_watchdog.h @@ -40,7 +40,7 @@ extern "C" { #endif /* __cplusplus */ #endif /* __cplusplus */ -#define WDT_WRWITE_MASK 0x50d83aa1 +#define WDT_WRITE_MASK 0x50d83aa1 #define RTC_CNTL 0x3ff48000 #define RTC_WDT_PROTECT 0x3ff480a4 #define RTC_WDT_CFG0 0x3ff4808c diff --git a/esp32/liteos_m/board/main.c b/esp32/liteos_m/board/main.c index 5409d16..c6e17a8 100644 --- a/esp32/liteos_m/board/main.c +++ b/esp32/liteos_m/board/main.c @@ -56,7 +56,7 @@ INT32 main(VOID) ret = LOS_KernelInit(); if (ret != LOS_OK) { - printf("Liteos kernel init failed! ERROR: 0x%x\n", ret); + printf("LiteOS kernel init failed! ERROR: 0x%x\n", ret); } FileSystemInit(); diff --git a/riscv32_virt/liteos_m/board/main.c b/riscv32_virt/liteos_m/board/main.c index b556b6a..e13ce07 100644 --- a/riscv32_virt/liteos_m/board/main.c +++ b/riscv32_virt/liteos_m/board/main.c @@ -116,7 +116,7 @@ LITE_OS_SEC_TEXT_INIT INT32 main(VOID) ret = LOS_KernelInit(); if (ret != LOS_OK) { - PRINT_ERR("Liteos kernel init failed! ERROR: 0x%x\n", ret); + PRINT_ERR("LiteOS kernel init failed! ERROR: 0x%x\n", ret); goto START_FAILED; } diff --git a/riscv32_virt/liteos_m/board/ui/fbdev.cpp b/riscv32_virt/liteos_m/board/ui/fbdev.cpp index 6f30374..157211e 100644 --- a/riscv32_virt/liteos_m/board/ui/fbdev.cpp +++ b/riscv32_virt/liteos_m/board/ui/fbdev.cpp @@ -32,7 +32,7 @@ struct DisplayDesc { static LayerInfo g_layerInfo = {}; static DisplayDesc g_display = {}; -constexpr const uint8_t DISPALY_DEV_ID = 0; +constexpr const uint8_t DISPLAY_DEV_ID = 0; #ifdef LAYER_PF_ARGB1555 constexpr const uint8_t LAYER_BPP = 16; constexpr const PixelFormat HDI_LAYER_PIXEL_FORMAT = PIXEL_FMT_RGBA_5551; @@ -75,7 +75,7 @@ static void DisplayInit(void) return; } if (g_display.layerFuncs->InitDisplay != nullptr) { - ret = g_display.layerFuncs->InitDisplay(DISPALY_DEV_ID); + ret = g_display.layerFuncs->InitDisplay(DISPLAY_DEV_ID); if (ret != DISPLAY_SUCCESS) { GRAPHIC_LOGE("InitDisplay fail"); return; @@ -88,7 +88,7 @@ static void OpenLayer(void) if (g_display.layerFuncs->GetDisplayInfo == nullptr) { return; } - g_display.devId = DISPALY_DEV_ID; + g_display.devId = DISPLAY_DEV_ID; DisplayInfo displayInfo = {}; int32_t ret = g_display.layerFuncs->GetDisplayInfo(g_display.devId, &displayInfo); if (ret != DISPLAY_SUCCESS) { -- Gitee