From f6b8cab2539e4d1ee9e47ab8e3eb12f1630f7393 Mon Sep 17 00:00:00 2001 From: kenneth <459864689@qq.com> Date: Fri, 23 Apr 2021 17:19:01 +0800 Subject: [PATCH] fix: fix some typo issues change 'LOS_MOUDLE_ID' to 'LOS_MODULE_ID', change 'a interrupt' to 'an interrupt', change 'HalIsIntAcvive' to 'HalIsIntActive' and other typos. close https://gitee.com/openharmony/kernel_liteos_m/issues/I3NNOQ, https://gitee.com/openharmony/kernel_liteos_m/issues/I3NNR6, https://gitee.com/openharmony/kernel_liteos_m/issues/I3NNTL, https://gitee.com/openharmony/kernel_liteos_m/issues/I3NNQ1 --- kernel/arch/arm/cortex-m3/keil/los_arch_interrupt.h | 4 ++-- kernel/arch/arm/cortex-m3/keil/los_interrupt.c | 4 ++-- kernel/arch/arm/cortex-m33/gcc/los_arch_interrupt.h | 4 ++-- kernel/arch/arm/cortex-m33/gcc/los_interrupt.c | 4 ++-- kernel/arch/arm/cortex-m4/gcc/los_arch_interrupt.h | 4 ++-- kernel/arch/arm/cortex-m4/gcc/los_interrupt.c | 4 ++-- kernel/arch/arm/cortex-m4/iar/los_arch_interrupt.h | 4 ++-- kernel/arch/arm/cortex-m4/iar/los_interrupt.c | 4 ++-- kernel/arch/arm/cortex-m7/gcc/los_arch_interrupt.h | 4 ++-- kernel/arch/arm/cortex-m7/gcc/los_interrupt.c | 4 ++-- kernel/arch/arm/cortex-m7/iar/los_arch_interrupt.h | 4 ++-- kernel/arch/arm/cortex-m7/iar/los_interrupt.c | 4 ++-- kernel/arch/include/los_interrupt.h | 4 ++-- kernel/arch/risc-v/riscv32/gcc/los_interrupt.c | 8 ++++---- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/kernel/arch/arm/cortex-m3/keil/los_arch_interrupt.h b/kernel/arch/arm/cortex-m3/keil/los_arch_interrupt.h index 3799986d..202da47a 100644 --- a/kernel/arch/arm/cortex-m3/keil/los_arch_interrupt.h +++ b/kernel/arch/arm/cortex-m3/keil/los_arch_interrupt.h @@ -344,7 +344,7 @@ extern VOID HalInterrupt(VOID); /* * * @ingroup los_hwi - * @brief: Get a interrupt number. + * @brief: Get an interrupt number. * * @par Description: * This API is used to get the current interrupt number. @@ -606,7 +606,7 @@ VOID HalHwiInit(); /** * @ingroup los_exc - * Cortex-M exception types: ncorrect usage indicating that the divisor is zero during the division operation. + * Cortex-M exception types: Incorrect usage indicating that the divisor is zero during the division operation. */ #define OS_EXC_UF_DIVBYZERO 10 diff --git a/kernel/arch/arm/cortex-m3/keil/los_interrupt.c b/kernel/arch/arm/cortex-m3/keil/los_interrupt.c index ac16ae16..b873680f 100644 --- a/kernel/arch/arm/cortex-m3/keil/los_interrupt.c +++ b/kernel/arch/arm/cortex-m3/keil/los_interrupt.c @@ -110,7 +110,7 @@ WEAK VOID SysTick_Handler(VOID) /* **************************************************************************** Function : HalIntNumGet - Description : Get a interrupt number + Description : Get an interrupt number Input : None Output : None Return : Interrupt Indexes number @@ -120,7 +120,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 HalIntNumGet(VOID) return __get_IPSR(); } -inline UINT32 HalIsIntAcvive(VOID) +inline UINT32 HalIsIntActive(VOID) { return (g_intCount > 0); } diff --git a/kernel/arch/arm/cortex-m33/gcc/los_arch_interrupt.h b/kernel/arch/arm/cortex-m33/gcc/los_arch_interrupt.h index 71a14842..787c9fb9 100644 --- a/kernel/arch/arm/cortex-m33/gcc/los_arch_interrupt.h +++ b/kernel/arch/arm/cortex-m33/gcc/los_arch_interrupt.h @@ -344,7 +344,7 @@ extern VOID HalInterrupt(VOID); /* * * @ingroup los_hwi - * @brief: Get a interrupt number. + * @brief: Get an interrupt number. * * @par Description: * This API is used to get the current interrupt number. @@ -606,7 +606,7 @@ VOID HalHwiInit(); /** * @ingroup los_exc - * Cortex-M exception types: ncorrect usage indicating that the divisor is zero during the division operation. + * Cortex-M exception types: Incorrect usage indicating that the divisor is zero during the division operation. */ #define OS_EXC_UF_DIVBYZERO 10 diff --git a/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c b/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c index dc8d312e..298a30d0 100644 --- a/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c +++ b/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c @@ -100,7 +100,7 @@ VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector) /* **************************************************************************** Function : HalIntNumGet - Description : Get a interrupt number + Description : Get an interrupt number Input : None Output : None Return : Interrupt Indexes number @@ -110,7 +110,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 HalIntNumGet(VOID) return __get_IPSR(); } -inline UINT32 HalIsIntAcvive(VOID) +inline UINT32 HalIsIntActive(VOID) { return (g_intCount > 0); } diff --git a/kernel/arch/arm/cortex-m4/gcc/los_arch_interrupt.h b/kernel/arch/arm/cortex-m4/gcc/los_arch_interrupt.h index 71a14842..787c9fb9 100644 --- a/kernel/arch/arm/cortex-m4/gcc/los_arch_interrupt.h +++ b/kernel/arch/arm/cortex-m4/gcc/los_arch_interrupt.h @@ -344,7 +344,7 @@ extern VOID HalInterrupt(VOID); /* * * @ingroup los_hwi - * @brief: Get a interrupt number. + * @brief: Get an interrupt number. * * @par Description: * This API is used to get the current interrupt number. @@ -606,7 +606,7 @@ VOID HalHwiInit(); /** * @ingroup los_exc - * Cortex-M exception types: ncorrect usage indicating that the divisor is zero during the division operation. + * Cortex-M exception types: Incorrect usage indicating that the divisor is zero during the division operation. */ #define OS_EXC_UF_DIVBYZERO 10 diff --git a/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c b/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c index 50d7935f..05af9a2d 100644 --- a/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c +++ b/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c @@ -110,7 +110,7 @@ WEAK VOID SysTick_Handler(VOID) /* **************************************************************************** Function : HalIntNumGet - Description : Get a interrupt number + Description : Get an interrupt number Input : None Output : None Return : Interrupt Indexes number @@ -120,7 +120,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 HalIntNumGet(VOID) return __get_IPSR(); } -inline UINT32 HalIsIntAcvive(VOID) +inline UINT32 HalIsIntActive(VOID) { return (g_intCount > 0); } diff --git a/kernel/arch/arm/cortex-m4/iar/los_arch_interrupt.h b/kernel/arch/arm/cortex-m4/iar/los_arch_interrupt.h index 71a14842..787c9fb9 100644 --- a/kernel/arch/arm/cortex-m4/iar/los_arch_interrupt.h +++ b/kernel/arch/arm/cortex-m4/iar/los_arch_interrupt.h @@ -344,7 +344,7 @@ extern VOID HalInterrupt(VOID); /* * * @ingroup los_hwi - * @brief: Get a interrupt number. + * @brief: Get an interrupt number. * * @par Description: * This API is used to get the current interrupt number. @@ -606,7 +606,7 @@ VOID HalHwiInit(); /** * @ingroup los_exc - * Cortex-M exception types: ncorrect usage indicating that the divisor is zero during the division operation. + * Cortex-M exception types: Incorrect usage indicating that the divisor is zero during the division operation. */ #define OS_EXC_UF_DIVBYZERO 10 diff --git a/kernel/arch/arm/cortex-m4/iar/los_interrupt.c b/kernel/arch/arm/cortex-m4/iar/los_interrupt.c index 12185c41..c989885e 100644 --- a/kernel/arch/arm/cortex-m4/iar/los_interrupt.c +++ b/kernel/arch/arm/cortex-m4/iar/los_interrupt.c @@ -111,7 +111,7 @@ WEAK VOID SysTick_Handler(VOID) /* **************************************************************************** Function : HalIntNumGet - Description : Get a interrupt number + Description : Get an interrupt number Input : None Output : None Return : Interrupt Indexes number @@ -121,7 +121,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 HalIntNumGet(VOID) return __get_IPSR(); } -inline UINT32 HalIsIntAcvive(VOID) +inline UINT32 HalIsIntActive(VOID) { return (g_intCount > 0); } diff --git a/kernel/arch/arm/cortex-m7/gcc/los_arch_interrupt.h b/kernel/arch/arm/cortex-m7/gcc/los_arch_interrupt.h index 3799986d..202da47a 100644 --- a/kernel/arch/arm/cortex-m7/gcc/los_arch_interrupt.h +++ b/kernel/arch/arm/cortex-m7/gcc/los_arch_interrupt.h @@ -344,7 +344,7 @@ extern VOID HalInterrupt(VOID); /* * * @ingroup los_hwi - * @brief: Get a interrupt number. + * @brief: Get an interrupt number. * * @par Description: * This API is used to get the current interrupt number. @@ -606,7 +606,7 @@ VOID HalHwiInit(); /** * @ingroup los_exc - * Cortex-M exception types: ncorrect usage indicating that the divisor is zero during the division operation. + * Cortex-M exception types: Incorrect usage indicating that the divisor is zero during the division operation. */ #define OS_EXC_UF_DIVBYZERO 10 diff --git a/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c b/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c index 40a831e5..ead8a624 100644 --- a/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c +++ b/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c @@ -100,7 +100,7 @@ VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector) /* **************************************************************************** Function : HalIntNumGet - Description : Get a interrupt number + Description : Get an interrupt number Input : None Output : None Return : Interrupt Indexes number @@ -110,7 +110,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 HalIntNumGet(VOID) return __get_IPSR(); } -inline UINT32 HalIsIntAcvive(VOID) +inline UINT32 HalIsIntActive(VOID) { return (g_intCount > 0); } diff --git a/kernel/arch/arm/cortex-m7/iar/los_arch_interrupt.h b/kernel/arch/arm/cortex-m7/iar/los_arch_interrupt.h index 71a14842..787c9fb9 100644 --- a/kernel/arch/arm/cortex-m7/iar/los_arch_interrupt.h +++ b/kernel/arch/arm/cortex-m7/iar/los_arch_interrupt.h @@ -344,7 +344,7 @@ extern VOID HalInterrupt(VOID); /* * * @ingroup los_hwi - * @brief: Get a interrupt number. + * @brief: Get an interrupt number. * * @par Description: * This API is used to get the current interrupt number. @@ -606,7 +606,7 @@ VOID HalHwiInit(); /** * @ingroup los_exc - * Cortex-M exception types: ncorrect usage indicating that the divisor is zero during the division operation. + * Cortex-M exception types: Incorrect usage indicating that the divisor is zero during the division operation. */ #define OS_EXC_UF_DIVBYZERO 10 diff --git a/kernel/arch/arm/cortex-m7/iar/los_interrupt.c b/kernel/arch/arm/cortex-m7/iar/los_interrupt.c index 193048d3..05d7b723 100644 --- a/kernel/arch/arm/cortex-m7/iar/los_interrupt.c +++ b/kernel/arch/arm/cortex-m7/iar/los_interrupt.c @@ -107,7 +107,7 @@ WEAK VOID SysTick_Handler(VOID) /* **************************************************************************** Function : HalIntNumGet - Description : Get a interrupt number + Description : Get an interrupt number Input : None Output : None Return : Interrupt Indexes number @@ -117,7 +117,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 HalIntNumGet(VOID) return __get_IPSR(); } -inline UINT32 HalIsIntAcvive(VOID) +inline UINT32 HalIsIntActive(VOID) { return (g_intCount > 0); } diff --git a/kernel/arch/include/los_interrupt.h b/kernel/arch/include/los_interrupt.h index fb13b5d2..69b24fb9 100644 --- a/kernel/arch/include/los_interrupt.h +++ b/kernel/arch/include/los_interrupt.h @@ -62,8 +62,8 @@ typedef VOID (*HWI_PROC_FUNC)(VOID *parm); typedef VOID (*HWI_PROC_FUNC)(void); #endif -UINT32 HalIsIntAcvive(VOID); -#define OS_INT_ACTIVE (HalIsIntAcvive()) +UINT32 HalIsIntActive(VOID); +#define OS_INT_ACTIVE (HalIsIntActive()) #define OS_INT_INACTIVE (!(OS_INT_ACTIVE)) /* * diff --git a/kernel/arch/risc-v/riscv32/gcc/los_interrupt.c b/kernel/arch/risc-v/riscv32/gcc/los_interrupt.c index 1f69d8b2..f65b33db 100644 --- a/kernel/arch/risc-v/riscv32/gcc/los_interrupt.c +++ b/kernel/arch/risc-v/riscv32/gcc/los_interrupt.c @@ -145,7 +145,7 @@ LITE_OS_SEC_TEXT HWI_HANDLE_FORM_S *HalGetHwiForm(VOID) } -inline UINT32 HalIsIntAcvive(VOID) +inline UINT32 HalIsIntActive(VOID) { return (g_intCount > 0); } @@ -316,8 +316,8 @@ STATIC VOID ExcInfoDisplay(const LosExcContext *excBufAddr) WEAK UINT32 HalUnalignedAccessFix(UINTPTR mcause, UINTPTR mepc, UINTPTR mtval, VOID *sp) { - /* Unaligned acess fixes are not supported by default */ - PRINTK("Unaligned acess fixes are not support by default!\n\r"); + /* Unaligned access fixes are not supported by default */ + PRINTK("Unaligned access fixes are not supported by default!\n\r"); return LOS_NOK; } @@ -327,7 +327,7 @@ VOID HalExcEntry(const LosExcContext *excBufAddr) g_excInfo.type = excBufAddr->mcause & 0x1FF; g_excInfo.context = (LosExcContext *)excBufAddr; if (g_excInfo.nestCnt > 2) { /* 2: Number of layers of exception nesting */ - PRINTK("hard faule!\n\r"); + PRINTK("hard fault!\n\r"); goto SYSTEM_DEATH; }