diff --git a/OAT.xml b/OAT.xml index 19ee0666733178db366902b24c36a388d64b5a50..2dafb6962832e87b956156936eb4fb35acc67563 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 247c54738d9be7dfe8fdf98004be08fc5967a36c..002b4718cce382b04be49dace25a9252f7526dff 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 4f72f8c882ece26b794eb3288655c05f78a81733..b1d8f716523ca8ce6c16b7c30c485ee22b4e86e4 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 98bc403e0a59c2aaad632b4b6693d007e76e6986..ed4241dfc0b4cd3bcbc5ba61c55f6bac79373089 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 335d86e16864fa368ef71d0bbd31438443266191..4bae33bb62a9219cf35099be7e798403479054d4 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 bd6f81a6e77513f2c0071f94c15ea5634437a6d3..85a50fa257baf65374fd1c9cfbb4b56659d8d8e7 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 380cb0362b790f0fddb50b5432abee5641d8f56b..82438d59a20026a168a7048e357628e6405721c4 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 5409d16b056aaeda52a361d56d573703ec99d560..c6e17a85a9f59efff43c3b182dd04e0b10923e55 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 b556b6ae590cd0626164731e49b2dc7d0be49925..e13ce07746cb6b3662ade579c4cd5d7dac83becf 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 6f30374b57c52c1f10cdf7124d8ba4b32770ad5d..157211e032177fde30156ee43d3a8483736f03d7 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) {