From 7fe3aaddf56b300ffcb2b186ae01ed64bef1c069 Mon Sep 17 00:00:00 2001
From: kenneth <zhushangyuan@huawei.com>
Date: Sat, 9 Oct 2021 08:37:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4C=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=AD=E6=97=A0=E7=94=A8=E7=9A=84=5F=5Fcplusplus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增的c-sky等模块一些c文件中的依旧保留了无用的__cplusplus需要删除;修复注释中的部分不规范内容修改，缩进，空行，错别字等。

close #I4D0YK

Signed-off-by: kenneth <zhushangyuan@huawei.com>
---
 kernel/arch/arm/arm9/gcc/los_arch_interrupt.h        |  2 +-
 kernel/arch/arm/cortex-m3/keil/los_arch_atomic.h     |  6 +++---
 kernel/arch/arm/cortex-m3/keil/los_arch_interrupt.h  |  7 +++----
 kernel/arch/arm/cortex-m3/keil/los_context.c         |  2 +-
 kernel/arch/arm/cortex-m3/keil/los_interrupt.c       |  6 +++---
 kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_atomic.h |  6 +++---
 .../arch/arm/cortex-m33/gcc/NTZ/los_arch_interrupt.h |  7 +++----
 kernel/arch/arm/cortex-m33/gcc/NTZ/los_context.c     |  2 +-
 kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S         |  8 ++++----
 kernel/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c   |  6 +++---
 .../cortex-m33/gcc/TZ/non_secure/los_arch_atomic.h   |  6 +++---
 .../cortex-m33/gcc/TZ/non_secure/los_arch_context.h  |  2 +-
 .../gcc/TZ/non_secure/los_arch_interrupt.h           |  7 +++----
 .../arm/cortex-m33/gcc/TZ/non_secure/los_context.c   |  4 ++--
 .../arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S  |  8 ++++----
 .../arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c |  6 +++---
 kernel/arch/arm/cortex-m33/gcc/los_arch_atomic.h     |  6 +++---
 kernel/arch/arm/cortex-m33/gcc/los_arch_interrupt.h  |  7 +++----
 kernel/arch/arm/cortex-m33/gcc/los_context.c         |  2 +-
 kernel/arch/arm/cortex-m33/gcc/los_dispatch.S        |  2 +-
 kernel/arch/arm/cortex-m33/gcc/los_exc.S             |  8 ++++----
 kernel/arch/arm/cortex-m33/gcc/los_interrupt.c       |  6 +++---
 kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_atomic.h |  2 +-
 .../arch/arm/cortex-m33/iar/NTZ/los_arch_interrupt.h |  2 +-
 kernel/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c   |  2 +-
 .../cortex-m33/iar/TZ/non_secure/los_arch_atomic.h   |  2 +-
 .../iar/TZ/non_secure/los_arch_interrupt.h           |  2 +-
 .../arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c |  2 +-
 kernel/arch/arm/cortex-m4/gcc/los_arch_atomic.h      |  6 +++---
 kernel/arch/arm/cortex-m4/gcc/los_arch_interrupt.h   |  5 ++---
 kernel/arch/arm/cortex-m4/gcc/los_context.c          |  2 +-
 kernel/arch/arm/cortex-m4/gcc/los_exc.S              |  2 +-
 kernel/arch/arm/cortex-m4/gcc/los_interrupt.c        |  6 +++---
 kernel/arch/arm/cortex-m4/iar/los_arch_atomic.h      |  6 +++---
 kernel/arch/arm/cortex-m4/iar/los_arch_interrupt.h   |  5 ++---
 kernel/arch/arm/cortex-m4/iar/los_context.c          |  2 +-
 kernel/arch/arm/cortex-m4/iar/los_interrupt.c        |  6 +++---
 kernel/arch/arm/cortex-m7/gcc/los_arch_atomic.h      |  6 +++---
 kernel/arch/arm/cortex-m7/gcc/los_arch_interrupt.h   |  7 +++----
 kernel/arch/arm/cortex-m7/gcc/los_context.c          |  2 +-
 kernel/arch/arm/cortex-m7/gcc/los_exc.S              |  8 ++++----
 kernel/arch/arm/cortex-m7/gcc/los_interrupt.c        |  6 +++---
 kernel/arch/arm/cortex-m7/iar/los_arch_atomic.h      |  6 +++---
 kernel/arch/arm/cortex-m7/iar/los_arch_interrupt.h   |  7 +++----
 kernel/arch/arm/cortex-m7/iar/los_context.c          |  2 +-
 kernel/arch/arm/cortex-m7/iar/los_interrupt.c        |  4 ++--
 kernel/arch/csky/v2/gcc/los_arch_atomic.h            |  3 ++-
 kernel/arch/csky/v2/gcc/los_interrupt.c              | 11 -----------
 kernel/arch/csky/v2/gcc/los_timer.c                  | 12 ------------
 kernel/arch/risc-v/nuclei/gcc/los_arch_context.h     |  2 +-
 kernel/arch/risc-v/nuclei/gcc/los_context.c          | 11 -----------
 kernel/arch/risc-v/nuclei/gcc/los_interrupt.c        | 11 -----------
 kernel/arch/risc-v/nuclei/gcc/los_timer.c            | 11 -----------
 kernel/arch/xtensa/lx6/gcc/los_arch_atomic.h         |  3 ++-
 kernel/arch/xtensa/lx6/gcc/los_interrupt.c           |  4 ++--
 55 files changed, 111 insertions(+), 173 deletions(-)

diff --git a/kernel/arch/arm/arm9/gcc/los_arch_interrupt.h b/kernel/arch/arm/arm9/gcc/los_arch_interrupt.h
index 83b68892..da76a53a 100644
--- a/kernel/arch/arm/arm9/gcc/los_arch_interrupt.h
+++ b/kernel/arch/arm/arm9/gcc/los_arch_interrupt.h
@@ -282,7 +282,7 @@ typedef struct TagExcContext {
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-VOID HalHwiInit();
+VOID HalHwiInit(VOID);
 
 /**
  * @ingroup los_exc
diff --git a/kernel/arch/arm/cortex-m3/keil/los_arch_atomic.h b/kernel/arch/arm/cortex-m3/keil/los_arch_atomic.h
index 3b6f3abf..74ac4ff7 100644
--- a/kernel/arch/arm/cortex-m3/keil/los_arch_atomic.h
+++ b/kernel/arch/arm/cortex-m3/keil/los_arch_atomic.h
@@ -50,7 +50,7 @@ extern "C" {
  * <ul>The pointer v must not be NULL.</ul>
  *
  * @param  v       [IN] The variable pointer.
- * @param  val       [IN] The exchange value.
+ * @param  val     [IN] The exchange value.
  *
  * @retval #INT32       The previous value of the atomic variable
  * @par Dependency:
@@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
  * @brief Atomic auto-decrement.
  *
  * @par Description:
- * This API is used to implementating the atomic auto-decrement and return the result of auto-decrement.
+ * This API is used to implement the atomic auto-decrement and return the result of auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
@@ -120,7 +120,7 @@ STATIC INLINE INT32 HalAtomicDecRet(volatile INT32 *v)
  *
  * @param  v       [IN] The variable pointer.
  * @param  val     [IN] The new value.
- * @param  oldVal      [IN] The old value.
+ * @param  oldVal  [IN] The old value.
  *
  * @retval TRUE  The previous value of the atomic variable is not equal to oldVal.
  * @retval FALSE The previous value of the atomic variable is equal to oldVal.
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 3c98b745..92508385 100644
--- a/kernel/arch/arm/cortex-m3/keil/los_arch_interrupt.h
+++ b/kernel/arch/arm/cortex-m3/keil/los_arch_interrupt.h
@@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li
-></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID HalHwiDefaultHandler(VOID);
@@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
 VOID HalExcBusFault(VOID);
 VOID HalExcUsageFault(VOID);
 VOID HalExcSvcCall(VOID);
-VOID HalHwiInit();
+VOID HalHwiInit(VOID);
 
 
 /**
@@ -681,7 +680,7 @@ VOID HalHwiInit();
  * @ingroup los_exc
  * Exception information structure
  *
- * Description: Exception information saved when an exception is triggered on the Cortex-M4 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M3 platform.
  *
  */
 typedef struct TagExcInfo {
diff --git a/kernel/arch/arm/cortex-m3/keil/los_context.c b/kernel/arch/arm/cortex-m3/keil/los_context.c
index 92778991..cf452530 100644
--- a/kernel/arch/arm/cortex-m3/keil/los_context.c
+++ b/kernel/arch/arm/cortex-m3/keil/los_context.c
@@ -77,7 +77,7 @@ LITE_OS_SEC_TEXT_MINOR VOID HalSysExit(VOID)
  Description : Task stack initialization function
  Input       : taskID     --- TaskID
                stackSize  --- Total size of the stack
-               topStack    --- Top of task's stack
+               topStack   --- Top of task's stack
  Output      : None
  Return      : Context pointer
  **************************************************************************** */
diff --git a/kernel/arch/arm/cortex-m3/keil/los_interrupt.c b/kernel/arch/arm/cortex-m3/keil/los_interrupt.c
index 0dee58cf..2b7384f2 100644
--- a/kernel/arch/arm/cortex-m3/keil/los_interrupt.c
+++ b/kernel/arch/arm/cortex-m3/keil/los_interrupt.c
@@ -52,7 +52,7 @@ LITE_OS_SEC_VEC
 #endif
 /* *
  * @ingroup los_hwi
- * hardware interrupt form mapping handling function array.
+ * Hardware interrupt form mapping handling function array.
  */
 STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
 
@@ -65,7 +65,7 @@ typedef struct {
 
 /* *
  * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
+ * Hardware interrupt handler form mapping handling function array.
  */
 STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
 
@@ -492,7 +492,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
  Output      : None
  Return      : None
  **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
+LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
diff --git a/kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_atomic.h b/kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_atomic.h
index 3b6f3abf..74ac4ff7 100755
--- a/kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_atomic.h
+++ b/kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_atomic.h
@@ -50,7 +50,7 @@ extern "C" {
  * <ul>The pointer v must not be NULL.</ul>
  *
  * @param  v       [IN] The variable pointer.
- * @param  val       [IN] The exchange value.
+ * @param  val     [IN] The exchange value.
  *
  * @retval #INT32       The previous value of the atomic variable
  * @par Dependency:
@@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
  * @brief Atomic auto-decrement.
  *
  * @par Description:
- * This API is used to implementating the atomic auto-decrement and return the result of auto-decrement.
+ * This API is used to implement the atomic auto-decrement and return the result of auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
@@ -120,7 +120,7 @@ STATIC INLINE INT32 HalAtomicDecRet(volatile INT32 *v)
  *
  * @param  v       [IN] The variable pointer.
  * @param  val     [IN] The new value.
- * @param  oldVal      [IN] The old value.
+ * @param  oldVal  [IN] The old value.
  *
  * @retval TRUE  The previous value of the atomic variable is not equal to oldVal.
  * @retval FALSE The previous value of the atomic variable is equal to oldVal.
diff --git a/kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_interrupt.h b/kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_interrupt.h
index dd1b3ed5..08218c87 100755
--- a/kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_interrupt.h
+++ b/kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_interrupt.h
@@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li
-></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID HalHwiDefaultHandler(VOID);
@@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
 VOID HalExcBusFault(VOID);
 VOID HalExcUsageFault(VOID);
 VOID HalSVCHandler(VOID);
-VOID HalHwiInit();
+VOID HalHwiInit(VOID);
 
 
 /**
@@ -681,7 +680,7 @@ VOID HalHwiInit();
  * @ingroup los_exc
  * Exception information structure
  *
- * Description: Exception information saved when an exception is triggered on the Cortex-M4 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M33 platform.
  *
  */
 typedef struct TagExcInfo {
diff --git a/kernel/arch/arm/cortex-m33/gcc/NTZ/los_context.c b/kernel/arch/arm/cortex-m33/gcc/NTZ/los_context.c
index b058362c..67f74f70 100755
--- a/kernel/arch/arm/cortex-m33/gcc/NTZ/los_context.c
+++ b/kernel/arch/arm/cortex-m33/gcc/NTZ/los_context.c
@@ -76,7 +76,7 @@ LITE_OS_SEC_TEXT_MINOR VOID HalSysExit(VOID)
  Description : Task stack initialization function
  Input       : taskID     --- TaskID
                stackSize  --- Total size of the stack
-               topStack    --- Top of task's stack
+               topStack   --- Top of task's stack
  Output      : None
  Return      : Context pointer
  **************************************************************************** */
diff --git a/kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S b/kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S
index 5660c577..449b5799 100755
--- a/kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S
+++ b/kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S
@@ -324,7 +324,7 @@ _hwiActiveCheckNext:
 
     LDR  R2, =g_taskScheduled
     LDR  R2, [R2]
-    TST  R2, #1         // OS_FLG_BGD_ACTIVE
+    TST  R2, #1                         // OS_FLG_BGD_ACTIVE
     BEQ  _ExcInMSP                      // if exc occured in Init then branch
 
 
@@ -337,7 +337,7 @@ _hwiActiveCheckNext:
 
     MRS   R3,  PSP
     ADD   R12, R3, #104
-    PUSH  {R12}    // save task SP
+    PUSH  {R12}                         // save task SP
 
     MRS   R12, PRIMASK
     PUSH {R4-R12}
@@ -360,12 +360,12 @@ _hwiActiveCheckNext:
 _NoFloatInPsp:
     .fnstart
     .cantunwind
-    MOV   R2,  R13                           //no auto push floating registers
+    MOV   R2,  R13                      // no auto push floating registers
     SUB   R13, #32                      // add 8 Bytes reg(for STMFD)
 
     MRS   R3,  PSP
     ADD   R12, R3, #32
-    PUSH  {R12}    // save task SP
+    PUSH  {R12}                         // save task SP
 
     MRS   R12, PRIMASK
     PUSH {R4-R12}
diff --git a/kernel/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c b/kernel/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c
index d1f55b80..ca5fc647 100755
--- a/kernel/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c
+++ b/kernel/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c
@@ -47,7 +47,7 @@ UINT32 g_intCount = 0;
 
 /* *
  * @ingroup los_hwi
- * hardware interrupt form mapping handling function array.
+ * Hardware interrupt form mapping handling function array.
  */
 STATIC HWI_PROC_FUNC __attribute__((aligned(0x100))) g_hwiForm[OS_VECTOR_CNT] = {0};
 
@@ -60,7 +60,7 @@ typedef struct {
 
 /* *
  * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
+ * Hardware interrupt handler form mapping handling function array.
  */
 STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
 
@@ -482,7 +482,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
  Output      : None
  Return      : None
  **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
+LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
diff --git a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_atomic.h b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_atomic.h
index 3b6f3abf..74ac4ff7 100755
--- a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_atomic.h
+++ b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_atomic.h
@@ -50,7 +50,7 @@ extern "C" {
  * <ul>The pointer v must not be NULL.</ul>
  *
  * @param  v       [IN] The variable pointer.
- * @param  val       [IN] The exchange value.
+ * @param  val     [IN] The exchange value.
  *
  * @retval #INT32       The previous value of the atomic variable
  * @par Dependency:
@@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
  * @brief Atomic auto-decrement.
  *
  * @par Description:
- * This API is used to implementating the atomic auto-decrement and return the result of auto-decrement.
+ * This API is used to implement the atomic auto-decrement and return the result of auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
@@ -120,7 +120,7 @@ STATIC INLINE INT32 HalAtomicDecRet(volatile INT32 *v)
  *
  * @param  v       [IN] The variable pointer.
  * @param  val     [IN] The new value.
- * @param  oldVal      [IN] The old value.
+ * @param  oldVal  [IN] The old value.
  *
  * @retval TRUE  The previous value of the atomic variable is not equal to oldVal.
  * @retval FALSE The previous value of the atomic variable is equal to oldVal.
diff --git a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_context.h b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_context.h
index 4a82ca3e..3f64e2ad 100755
--- a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_context.h
+++ b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_context.h
@@ -43,7 +43,7 @@ extern "C" {
 
 typedef struct TagTskContext {
     UINT32 secureContext;
-    UINT32 stackLmit;
+    UINT32 stackLimit;
     UINT32 excReturn;
 #if ((defined(__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
      (defined(__FPU_USED) && (__FPU_USED == 1U)))
diff --git a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_interrupt.h b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_interrupt.h
index dd1b3ed5..08218c87 100755
--- a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_interrupt.h
+++ b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_interrupt.h
@@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li
-></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID HalHwiDefaultHandler(VOID);
@@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
 VOID HalExcBusFault(VOID);
 VOID HalExcUsageFault(VOID);
 VOID HalSVCHandler(VOID);
-VOID HalHwiInit();
+VOID HalHwiInit(VOID);
 
 
 /**
@@ -681,7 +680,7 @@ VOID HalHwiInit();
  * @ingroup los_exc
  * Exception information structure
  *
- * Description: Exception information saved when an exception is triggered on the Cortex-M4 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M33 platform.
  *
  */
 typedef struct TagExcInfo {
diff --git a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_context.c b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_context.c
index 4aa333d8..306e580e 100755
--- a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_context.c
+++ b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_context.c
@@ -76,7 +76,7 @@ LITE_OS_SEC_TEXT_MINOR VOID HalSysExit(VOID)
  Description : Task stack initialization function
  Input       : taskID     --- TaskID
                stackSize  --- Total size of the stack
-               topStack    --- Top of task's stack
+               topStack   --- Top of task's stack
  Output      : None
  Return      : Context pointer
  **************************************************************************** */
@@ -133,7 +133,7 @@ LITE_OS_SEC_TEXT_INIT VOID *HalTskStackInit(UINT32 taskID, UINT32 stackSize, VOI
 #endif
 
     context->secureContext = 0UL;
-    context->stackLmit = (UINT32)topStack;
+    context->stackLimit = (UINT32)topStack;
     context->excReturn = 0xFFFFFFBC;
 
     context->uwR4 = 0x04040404L;
diff --git a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S
index e95b12c5..f8274299 100755
--- a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S
+++ b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S
@@ -308,7 +308,7 @@ _hwiActiveCheckNext:
 
     LDR  R2, =g_taskScheduled
     LDR  R2, [R2]
-    TST  R2, #1         // OS_FLG_BGD_ACTIVE
+    TST  R2, #1                         // OS_FLG_BGD_ACTIVE
     BEQ  _ExcInMSP                      // if exc occured in Init then branch
 
 
@@ -321,7 +321,7 @@ _hwiActiveCheckNext:
 
     MRS   R3,  PSP
     ADD   R12, R3, #104
-    PUSH  {R12}    // save task SP
+    PUSH  {R12}                         // save task SP
 
     MRS   R12, PRIMASK
     PUSH {R4-R12}
@@ -344,12 +344,12 @@ _hwiActiveCheckNext:
 _NoFloatInPsp:
     .fnstart
     .cantunwind
-    MOV   R2,  R13                           //no auto push floating registers
+    MOV   R2,  R13                      // no auto push floating registers
     SUB   R13, #32                      // add 8 Bytes reg(for STMFD)
 
     MRS   R3,  PSP
     ADD   R12, R3, #32
-    PUSH  {R12}    // save task SP
+    PUSH  {R12}                         // save task SP
 
     MRS   R12, PRIMASK
     PUSH {R4-R12}
diff --git a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c
index d1f55b80..ca5fc647 100755
--- a/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c
+++ b/kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c
@@ -47,7 +47,7 @@ UINT32 g_intCount = 0;
 
 /* *
  * @ingroup los_hwi
- * hardware interrupt form mapping handling function array.
+ * Hardware interrupt form mapping handling function array.
  */
 STATIC HWI_PROC_FUNC __attribute__((aligned(0x100))) g_hwiForm[OS_VECTOR_CNT] = {0};
 
@@ -60,7 +60,7 @@ typedef struct {
 
 /* *
  * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
+ * Hardware interrupt handler form mapping handling function array.
  */
 STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
 
@@ -482,7 +482,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
  Output      : None
  Return      : None
  **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
+LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
diff --git a/kernel/arch/arm/cortex-m33/gcc/los_arch_atomic.h b/kernel/arch/arm/cortex-m33/gcc/los_arch_atomic.h
index 3b6f3abf..74ac4ff7 100644
--- a/kernel/arch/arm/cortex-m33/gcc/los_arch_atomic.h
+++ b/kernel/arch/arm/cortex-m33/gcc/los_arch_atomic.h
@@ -50,7 +50,7 @@ extern "C" {
  * <ul>The pointer v must not be NULL.</ul>
  *
  * @param  v       [IN] The variable pointer.
- * @param  val       [IN] The exchange value.
+ * @param  val     [IN] The exchange value.
  *
  * @retval #INT32       The previous value of the atomic variable
  * @par Dependency:
@@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
  * @brief Atomic auto-decrement.
  *
  * @par Description:
- * This API is used to implementating the atomic auto-decrement and return the result of auto-decrement.
+ * This API is used to implement the atomic auto-decrement and return the result of auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
@@ -120,7 +120,7 @@ STATIC INLINE INT32 HalAtomicDecRet(volatile INT32 *v)
  *
  * @param  v       [IN] The variable pointer.
  * @param  val     [IN] The new value.
- * @param  oldVal      [IN] The old value.
+ * @param  oldVal  [IN] The old value.
  *
  * @retval TRUE  The previous value of the atomic variable is not equal to oldVal.
  * @retval FALSE The previous value of the atomic variable is equal to oldVal.
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 3c98b745..6c186db0 100644
--- a/kernel/arch/arm/cortex-m33/gcc/los_arch_interrupt.h
+++ b/kernel/arch/arm/cortex-m33/gcc/los_arch_interrupt.h
@@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li
-></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID HalHwiDefaultHandler(VOID);
@@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
 VOID HalExcBusFault(VOID);
 VOID HalExcUsageFault(VOID);
 VOID HalExcSvcCall(VOID);
-VOID HalHwiInit();
+VOID HalHwiInit(VOID);
 
 
 /**
@@ -681,7 +680,7 @@ VOID HalHwiInit();
  * @ingroup los_exc
  * Exception information structure
  *
- * Description: Exception information saved when an exception is triggered on the Cortex-M4 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M33 platform.
  *
  */
 typedef struct TagExcInfo {
diff --git a/kernel/arch/arm/cortex-m33/gcc/los_context.c b/kernel/arch/arm/cortex-m33/gcc/los_context.c
index cf69d52e..a00fc73d 100644
--- a/kernel/arch/arm/cortex-m33/gcc/los_context.c
+++ b/kernel/arch/arm/cortex-m33/gcc/los_context.c
@@ -77,7 +77,7 @@ LITE_OS_SEC_TEXT_MINOR VOID HalSysExit(VOID)
  Description : Task stack initialization function
  Input       : taskID     --- TaskID
                stackSize  --- Total size of the stack
-               topStack    --- Top of task's stack
+               topStack   --- Top of task's stack
  Output      : None
  Return      : Context pointer
  **************************************************************************** */
diff --git a/kernel/arch/arm/cortex-m33/gcc/los_dispatch.S b/kernel/arch/arm/cortex-m33/gcc/los_dispatch.S
index 29291e80..6446eb93 100644
--- a/kernel/arch/arm/cortex-m33/gcc/los_dispatch.S
+++ b/kernel/arch/arm/cortex-m33/gcc/los_dispatch.S
@@ -171,7 +171,7 @@ TaskContextSwitch:
     ldr     r0, [r5, #4]
     str     r0, [r5]
 
-    ldr     r1,   [r0]
+    ldr     r1, [r0]
 
 #if ((defined(__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
      (defined(__FPU_USED) && (__FPU_USED == 1U)))
diff --git a/kernel/arch/arm/cortex-m33/gcc/los_exc.S b/kernel/arch/arm/cortex-m33/gcc/los_exc.S
index af0753ab..7675dd16 100644
--- a/kernel/arch/arm/cortex-m33/gcc/los_exc.S
+++ b/kernel/arch/arm/cortex-m33/gcc/los_exc.S
@@ -324,7 +324,7 @@ _hwiActiveCheckNext:
 
     LDR  R2, =g_taskScheduled
     LDR  R2, [R2]
-    TST  R2, #1         // OS_FLG_BGD_ACTIVE
+    TST  R2, #1                         // OS_FLG_BGD_ACTIVE
     BEQ  _ExcInMSP                      // if exc occured in Init then branch
 
 
@@ -337,7 +337,7 @@ _hwiActiveCheckNext:
 
     MRS   R3,  PSP
     ADD   R12, R3, #104
-    PUSH  {R12}    // save task SP
+    PUSH  {R12}                         // save task SP
 
     MRS   R12, PRIMASK
     PUSH {R4-R12}
@@ -360,12 +360,12 @@ _hwiActiveCheckNext:
 _NoFloatInPsp:
     .fnstart
     .cantunwind
-    MOV   R2,  R13                           //no auto push floating registers
+    MOV   R2,  R13                      // no auto push floating registers
     SUB   R13, #32                      // add 8 Bytes reg(for STMFD)
 
     MRS   R3,  PSP
     ADD   R12, R3, #32
-    PUSH  {R12}    // save task SP
+    PUSH  {R12}                         // save task SP
 
     MRS   R12, PRIMASK
     PUSH {R4-R12}
diff --git a/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c b/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c
index c5952da6..364fd1f5 100644
--- a/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c
+++ b/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c
@@ -47,7 +47,7 @@ UINT32 g_intCount = 0;
 
 /* *
  * @ingroup los_hwi
- * hardware interrupt form mapping handling function array.
+ * Hardware interrupt form mapping handling function array.
  */
 STATIC HWI_PROC_FUNC __attribute__((aligned(0x100))) g_hwiForm[OS_VECTOR_CNT] = {0};
 
@@ -60,7 +60,7 @@ typedef struct {
 
 /* *
  * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
+ * Hardware interrupt handler form mapping handling function array.
  */
 STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
 
@@ -482,7 +482,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
  Output      : None
  Return      : None
  **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
+LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
diff --git a/kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_atomic.h b/kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_atomic.h
index e57c6a9b..2ba9a8e5 100644
--- a/kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_atomic.h
+++ b/kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_atomic.h
@@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
  * @brief Atomic auto-decrement.
  *
  * @par Description:
- * This API is used to implementating the atomic auto-decrement and return the result of auto-decrement.
+ * This API is used to implement the atomic auto-decrement and return the result of auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
diff --git a/kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_interrupt.h b/kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_interrupt.h
index e02d529c..dfa5f17a 100644
--- a/kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_interrupt.h
+++ b/kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_interrupt.h
@@ -546,7 +546,7 @@ VOID HalExcMemFault(VOID);
 VOID HalExcBusFault(VOID);
 VOID HalExcUsageFault(VOID);
 VOID HalSVCHandler(VOID);
-VOID HalHwiInit();
+VOID HalHwiInit(VOID);
 
 
 /**
diff --git a/kernel/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c b/kernel/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c
index 283b7234..40f75272 100644
--- a/kernel/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c
+++ b/kernel/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c
@@ -491,7 +491,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
  Output      : None
  Return      : None
  **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
+LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
diff --git a/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_atomic.h b/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_atomic.h
index e57c6a9b..2ba9a8e5 100644
--- a/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_atomic.h
+++ b/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_atomic.h
@@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
  * @brief Atomic auto-decrement.
  *
  * @par Description:
- * This API is used to implementating the atomic auto-decrement and return the result of auto-decrement.
+ * This API is used to implement the atomic auto-decrement and return the result of auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
diff --git a/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_interrupt.h b/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_interrupt.h
index e02d529c..dfa5f17a 100644
--- a/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_interrupt.h
+++ b/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_interrupt.h
@@ -546,7 +546,7 @@ VOID HalExcMemFault(VOID);
 VOID HalExcBusFault(VOID);
 VOID HalExcUsageFault(VOID);
 VOID HalSVCHandler(VOID);
-VOID HalHwiInit();
+VOID HalHwiInit(VOID);
 
 
 /**
diff --git a/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c b/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c
index 283b7234..40f75272 100644
--- a/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c
+++ b/kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c
@@ -491,7 +491,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
  Output      : None
  Return      : None
  **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
+LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
diff --git a/kernel/arch/arm/cortex-m4/gcc/los_arch_atomic.h b/kernel/arch/arm/cortex-m4/gcc/los_arch_atomic.h
index 3b6f3abf..74ac4ff7 100644
--- a/kernel/arch/arm/cortex-m4/gcc/los_arch_atomic.h
+++ b/kernel/arch/arm/cortex-m4/gcc/los_arch_atomic.h
@@ -50,7 +50,7 @@ extern "C" {
  * <ul>The pointer v must not be NULL.</ul>
  *
  * @param  v       [IN] The variable pointer.
- * @param  val       [IN] The exchange value.
+ * @param  val     [IN] The exchange value.
  *
  * @retval #INT32       The previous value of the atomic variable
  * @par Dependency:
@@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
  * @brief Atomic auto-decrement.
  *
  * @par Description:
- * This API is used to implementating the atomic auto-decrement and return the result of auto-decrement.
+ * This API is used to implement the atomic auto-decrement and return the result of auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
@@ -120,7 +120,7 @@ STATIC INLINE INT32 HalAtomicDecRet(volatile INT32 *v)
  *
  * @param  v       [IN] The variable pointer.
  * @param  val     [IN] The new value.
- * @param  oldVal      [IN] The old value.
+ * @param  oldVal  [IN] The old value.
  *
  * @retval TRUE  The previous value of the atomic variable is not equal to oldVal.
  * @retval FALSE The previous value of the atomic variable is equal to oldVal.
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 3c98b745..8319a982 100644
--- a/kernel/arch/arm/cortex-m4/gcc/los_arch_interrupt.h
+++ b/kernel/arch/arm/cortex-m4/gcc/los_arch_interrupt.h
@@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li
-></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID HalHwiDefaultHandler(VOID);
@@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
 VOID HalExcBusFault(VOID);
 VOID HalExcUsageFault(VOID);
 VOID HalExcSvcCall(VOID);
-VOID HalHwiInit();
+VOID HalHwiInit(VOID);
 
 
 /**
diff --git a/kernel/arch/arm/cortex-m4/gcc/los_context.c b/kernel/arch/arm/cortex-m4/gcc/los_context.c
index 89551317..2a257440 100644
--- a/kernel/arch/arm/cortex-m4/gcc/los_context.c
+++ b/kernel/arch/arm/cortex-m4/gcc/los_context.c
@@ -78,7 +78,7 @@ LITE_OS_SEC_TEXT_MINOR VOID HalSysExit(VOID)
  Description : Task stack initialization function
  Input       : taskID     --- TaskID
                stackSize  --- Total size of the stack
-               topStack    --- Top of task's stack
+               topStack   --- Top of task's stack
  Output      : None
  Return      : Context pointer
  **************************************************************************** */
diff --git a/kernel/arch/arm/cortex-m4/gcc/los_exc.S b/kernel/arch/arm/cortex-m4/gcc/los_exc.S
index b2106500..6b0e0973 100644
--- a/kernel/arch/arm/cortex-m4/gcc/los_exc.S
+++ b/kernel/arch/arm/cortex-m4/gcc/los_exc.S
@@ -352,7 +352,7 @@ _hwiActiveCheckNext:
 _NoFloatInPsp:
     .fnstart
     .cantunwind
-    MOV   R2,  R13                      //no auto push floating registers
+    MOV   R2,  R13                      // no auto push floating registers
     SUB   R13, #32                      // add 8 Bytes reg(for STMFD)
 
     MRS   R3,  PSP
diff --git a/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c b/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c
index 6ab35187..51007500 100644
--- a/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c
+++ b/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c
@@ -52,7 +52,7 @@ LITE_OS_SEC_VEC
 #endif
 /* *
  * @ingroup los_hwi
- * hardware interrupt form mapping handling function array.
+ * Hardware interrupt form mapping handling function array.
  */
 STATIC HWI_PROC_FUNC __attribute__((aligned(0x100))) g_hwiForm[OS_VECTOR_CNT] = {0};
 
@@ -65,7 +65,7 @@ typedef struct {
 
 /* *
  * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
+ * Hardware interrupt handler form mapping handling function array.
  */
 STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
 
@@ -502,7 +502,7 @@ WEAK VOID __stack_chk_fail(VOID)
  Output      : None
  Return      : None
  **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
+LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
diff --git a/kernel/arch/arm/cortex-m4/iar/los_arch_atomic.h b/kernel/arch/arm/cortex-m4/iar/los_arch_atomic.h
index 345d87ba..4c16305e 100644
--- a/kernel/arch/arm/cortex-m4/iar/los_arch_atomic.h
+++ b/kernel/arch/arm/cortex-m4/iar/los_arch_atomic.h
@@ -50,7 +50,7 @@ extern "C" {
  * <ul>The pointer v must not be NULL.</ul>
  *
  * @param  v       [IN] The variable pointer.
- * @param  val       [IN] The exchange value.
+ * @param  val     [IN] The exchange value.
  *
  * @retval #INT32       The previous value of the atomic variable
  * @par Dependency:
@@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
  * @brief Atomic auto-decrement.
  *
  * @par Description:
- * This API is used to implementating the atomic auto-decrement and return the result of auto-decrement.
+ * This API is used to implement the atomic auto-decrement and return the result of auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
@@ -120,7 +120,7 @@ STATIC INLINE INT32 HalAtomicDecRet(volatile INT32 *v)
  *
  * @param  v       [IN] The variable pointer.
  * @param  val     [IN] The new value.
- * @param  oldVal      [IN] The old value.
+ * @param  oldVal  [IN] The old value.
  *
  * @retval TRUE  The previous value of the atomic variable is not equal to oldVal.
  * @retval FALSE The previous value of the atomic variable is equal to oldVal.
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 3c98b745..8319a982 100644
--- a/kernel/arch/arm/cortex-m4/iar/los_arch_interrupt.h
+++ b/kernel/arch/arm/cortex-m4/iar/los_arch_interrupt.h
@@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li
-></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID HalHwiDefaultHandler(VOID);
@@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
 VOID HalExcBusFault(VOID);
 VOID HalExcUsageFault(VOID);
 VOID HalExcSvcCall(VOID);
-VOID HalHwiInit();
+VOID HalHwiInit(VOID);
 
 
 /**
diff --git a/kernel/arch/arm/cortex-m4/iar/los_context.c b/kernel/arch/arm/cortex-m4/iar/los_context.c
index 42538288..a8a4a866 100644
--- a/kernel/arch/arm/cortex-m4/iar/los_context.c
+++ b/kernel/arch/arm/cortex-m4/iar/los_context.c
@@ -79,7 +79,7 @@ LITE_OS_SEC_TEXT_MINOR VOID HalSysExit(VOID)
  Description : Task stack initialization function
  Input       : taskID     --- TaskID
                stackSize  --- Total size of the stack
-               topStack    --- Top of task's stack
+               topStack   --- Top of task's stack
  Output      : None
  Return      : Context pointer
  **************************************************************************** */
diff --git a/kernel/arch/arm/cortex-m4/iar/los_interrupt.c b/kernel/arch/arm/cortex-m4/iar/los_interrupt.c
index cd7ff15c..1530fbe3 100644
--- a/kernel/arch/arm/cortex-m4/iar/los_interrupt.c
+++ b/kernel/arch/arm/cortex-m4/iar/los_interrupt.c
@@ -53,7 +53,7 @@ LITE_OS_SEC_VEC
 #endif
 /* *
  * @ingroup los_hwi
- * hardware interrupt form mapping handling function array.
+ * Hardware interrupt form mapping handling function array.
  */
 STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
 
@@ -66,7 +66,7 @@ typedef struct {
 
 /* *
  * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
+ * Hardware interrupt handler form mapping handling function array.
  */
 STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
 
@@ -495,7 +495,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
  Output      : None
  Return      : None
  **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
+LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
diff --git a/kernel/arch/arm/cortex-m7/gcc/los_arch_atomic.h b/kernel/arch/arm/cortex-m7/gcc/los_arch_atomic.h
index 345d87ba..4c16305e 100644
--- a/kernel/arch/arm/cortex-m7/gcc/los_arch_atomic.h
+++ b/kernel/arch/arm/cortex-m7/gcc/los_arch_atomic.h
@@ -50,7 +50,7 @@ extern "C" {
  * <ul>The pointer v must not be NULL.</ul>
  *
  * @param  v       [IN] The variable pointer.
- * @param  val       [IN] The exchange value.
+ * @param  val     [IN] The exchange value.
  *
  * @retval #INT32       The previous value of the atomic variable
  * @par Dependency:
@@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
  * @brief Atomic auto-decrement.
  *
  * @par Description:
- * This API is used to implementating the atomic auto-decrement and return the result of auto-decrement.
+ * This API is used to implement the atomic auto-decrement and return the result of auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
@@ -120,7 +120,7 @@ STATIC INLINE INT32 HalAtomicDecRet(volatile INT32 *v)
  *
  * @param  v       [IN] The variable pointer.
  * @param  val     [IN] The new value.
- * @param  oldVal      [IN] The old value.
+ * @param  oldVal  [IN] The old value.
  *
  * @retval TRUE  The previous value of the atomic variable is not equal to oldVal.
  * @retval FALSE The previous value of the atomic variable is equal to oldVal.
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 3c98b745..4e08126f 100644
--- a/kernel/arch/arm/cortex-m7/gcc/los_arch_interrupt.h
+++ b/kernel/arch/arm/cortex-m7/gcc/los_arch_interrupt.h
@@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li
-></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID HalHwiDefaultHandler(VOID);
@@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
 VOID HalExcBusFault(VOID);
 VOID HalExcUsageFault(VOID);
 VOID HalExcSvcCall(VOID);
-VOID HalHwiInit();
+VOID HalHwiInit(VOID);
 
 
 /**
@@ -681,7 +680,7 @@ VOID HalHwiInit();
  * @ingroup los_exc
  * Exception information structure
  *
- * Description: Exception information saved when an exception is triggered on the Cortex-M4 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M7 platform.
  *
  */
 typedef struct TagExcInfo {
diff --git a/kernel/arch/arm/cortex-m7/gcc/los_context.c b/kernel/arch/arm/cortex-m7/gcc/los_context.c
index b058362c..67f74f70 100644
--- a/kernel/arch/arm/cortex-m7/gcc/los_context.c
+++ b/kernel/arch/arm/cortex-m7/gcc/los_context.c
@@ -76,7 +76,7 @@ LITE_OS_SEC_TEXT_MINOR VOID HalSysExit(VOID)
  Description : Task stack initialization function
  Input       : taskID     --- TaskID
                stackSize  --- Total size of the stack
-               topStack    --- Top of task's stack
+               topStack   --- Top of task's stack
  Output      : None
  Return      : Context pointer
  **************************************************************************** */
diff --git a/kernel/arch/arm/cortex-m7/gcc/los_exc.S b/kernel/arch/arm/cortex-m7/gcc/los_exc.S
index bef3bc89..4ea0e827 100644
--- a/kernel/arch/arm/cortex-m7/gcc/los_exc.S
+++ b/kernel/arch/arm/cortex-m7/gcc/los_exc.S
@@ -324,7 +324,7 @@ _hwiActiveCheckNext:
 
     LDR  R2, =g_taskScheduled
     LDR  R2, [R2]
-    TST  R2, #1         // OS_FLG_BGD_ACTIVE
+    TST  R2, #1                         // OS_FLG_BGD_ACTIVE
     BEQ  _ExcInMSP                      // if exc occured in Init then branch
 
 
@@ -337,7 +337,7 @@ _hwiActiveCheckNext:
 
     MRS   R3,  PSP
     ADD   R12, R3, #104
-    PUSH  {R12}    // save task SP
+    PUSH  {R12}                         // save task SP
 
     MRS   R12, PRIMASK
     PUSH {R4-R12}
@@ -357,12 +357,12 @@ _hwiActiveCheckNext:
 _NoFloatInPsp:
     .fnstart
     .cantunwind
-    MOV   R2,  R13                           //no auto push floating registers
+    MOV   R2,  R13                      // no auto push floating registers
     SUB   R13, #32                      // add 8 Bytes reg(for STMFD)
 
     MRS   R3,  PSP
     ADD   R12, R3, #32
-    PUSH  {R12}    // save task SP
+    PUSH  {R12}                         // save task SP
 
     MRS   R12, PRIMASK
     PUSH {R4-R12}
diff --git a/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c b/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c
index e1eb52e3..17e9fab7 100644
--- a/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c
+++ b/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c
@@ -47,7 +47,7 @@ UINT32 g_intCount = 0;
 
 /* *
  * @ingroup los_hwi
- * hardware interrupt form mapping handling function array.
+ * Hardware interrupt form mapping handling function array.
  */
 STATIC HWI_PROC_FUNC __attribute__((aligned(0x100))) g_hwiForm[OS_VECTOR_CNT] = {0};
 
@@ -60,7 +60,7 @@ typedef struct {
 
 /* *
  * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
+ * Hardware interrupt handler form mapping handling function array.
  */
 STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
 
@@ -482,7 +482,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
  Output      : None
  Return      : None
  **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
+LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
diff --git a/kernel/arch/arm/cortex-m7/iar/los_arch_atomic.h b/kernel/arch/arm/cortex-m7/iar/los_arch_atomic.h
index 345d87ba..4c16305e 100644
--- a/kernel/arch/arm/cortex-m7/iar/los_arch_atomic.h
+++ b/kernel/arch/arm/cortex-m7/iar/los_arch_atomic.h
@@ -50,7 +50,7 @@ extern "C" {
  * <ul>The pointer v must not be NULL.</ul>
  *
  * @param  v       [IN] The variable pointer.
- * @param  val       [IN] The exchange value.
+ * @param  val     [IN] The exchange value.
  *
  * @retval #INT32       The previous value of the atomic variable
  * @par Dependency:
@@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
  * @brief Atomic auto-decrement.
  *
  * @par Description:
- * This API is used to implementating the atomic auto-decrement and return the result of auto-decrement.
+ * This API is used to implement the atomic auto-decrement and return the result of auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
@@ -120,7 +120,7 @@ STATIC INLINE INT32 HalAtomicDecRet(volatile INT32 *v)
  *
  * @param  v       [IN] The variable pointer.
  * @param  val     [IN] The new value.
- * @param  oldVal      [IN] The old value.
+ * @param  oldVal  [IN] The old value.
  *
  * @retval TRUE  The previous value of the atomic variable is not equal to oldVal.
  * @retval FALSE The previous value of the atomic variable is equal to oldVal.
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 3c98b745..4e08126f 100644
--- a/kernel/arch/arm/cortex-m7/iar/los_arch_interrupt.h
+++ b/kernel/arch/arm/cortex-m7/iar/los_arch_interrupt.h
@@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li
-></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID HalHwiDefaultHandler(VOID);
@@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
 VOID HalExcBusFault(VOID);
 VOID HalExcUsageFault(VOID);
 VOID HalExcSvcCall(VOID);
-VOID HalHwiInit();
+VOID HalHwiInit(VOID);
 
 
 /**
@@ -681,7 +680,7 @@ VOID HalHwiInit();
  * @ingroup los_exc
  * Exception information structure
  *
- * Description: Exception information saved when an exception is triggered on the Cortex-M4 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M7 platform.
  *
  */
 typedef struct TagExcInfo {
diff --git a/kernel/arch/arm/cortex-m7/iar/los_context.c b/kernel/arch/arm/cortex-m7/iar/los_context.c
index b058362c..67f74f70 100644
--- a/kernel/arch/arm/cortex-m7/iar/los_context.c
+++ b/kernel/arch/arm/cortex-m7/iar/los_context.c
@@ -76,7 +76,7 @@ LITE_OS_SEC_TEXT_MINOR VOID HalSysExit(VOID)
  Description : Task stack initialization function
  Input       : taskID     --- TaskID
                stackSize  --- Total size of the stack
-               topStack    --- Top of task's stack
+               topStack   --- Top of task's stack
  Output      : None
  Return      : Context pointer
  **************************************************************************** */
diff --git a/kernel/arch/arm/cortex-m7/iar/los_interrupt.c b/kernel/arch/arm/cortex-m7/iar/los_interrupt.c
index 6c5adc22..8cd6d691 100644
--- a/kernel/arch/arm/cortex-m7/iar/los_interrupt.c
+++ b/kernel/arch/arm/cortex-m7/iar/los_interrupt.c
@@ -49,7 +49,7 @@ UINT32 g_intCount = 0;
 #pragma data_alignment=0x100
 /* *
  * @ingroup los_hwi
- * hardware interrupt form mapping handling function array.
+ * Hardware interrupt form mapping handling function array.
  */
 STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
 
@@ -62,7 +62,7 @@ typedef struct {
 
 /* *
  * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
+ * Hardware interrupt handler form mapping handling function array.
  */
 STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
 
diff --git a/kernel/arch/csky/v2/gcc/los_arch_atomic.h b/kernel/arch/csky/v2/gcc/los_arch_atomic.h
index b86b038d..5efc8e61 100644
--- a/kernel/arch/csky/v2/gcc/los_arch_atomic.h
+++ b/kernel/arch/csky/v2/gcc/los_arch_atomic.h
@@ -79,7 +79,8 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
- * <li>The value which v point to must not be INT_MIN to avoid overflow after reducing 1.</li></ul>
+ * <li>The value which v point to must not be INT_MIN to avoid overflow after reducing 1.</li>
+ * </ul>
  *
  * @param  v      [IN] The addSelf variable pointer.
  *
diff --git a/kernel/arch/csky/v2/gcc/los_interrupt.c b/kernel/arch/csky/v2/gcc/los_interrupt.c
index d0128c02..f18abf70 100644
--- a/kernel/arch/csky/v2/gcc/los_interrupt.c
+++ b/kernel/arch/csky/v2/gcc/los_interrupt.c
@@ -42,12 +42,6 @@
 #include "los_memory.h"
 #include "los_membox.h"
 
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
 #define INT_OFFSET       6
 #define PRI_OFF_PER_INT  8
 #define PRI_PER_REG      4
@@ -583,8 +577,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
     return;
 }
 
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __cplusplus */
diff --git a/kernel/arch/csky/v2/gcc/los_timer.c b/kernel/arch/csky/v2/gcc/los_timer.c
index c38de171..8fb1aa2d 100644
--- a/kernel/arch/csky/v2/gcc/los_timer.c
+++ b/kernel/arch/csky/v2/gcc/los_timer.c
@@ -37,12 +37,6 @@
 #include "los_sched.h"
 #include "los_debug.h"
 
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
 typedef struct {
     UINT32 CTRL;
     UINT32 LOAD;
@@ -138,9 +132,3 @@ UINT32 HalEnterSleep(VOID)
     Wfi();
     return LOS_OK;
 }
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __cplusplus */
diff --git a/kernel/arch/risc-v/nuclei/gcc/los_arch_context.h b/kernel/arch/risc-v/nuclei/gcc/los_arch_context.h
index 09e7ab9e..c2d913d3 100644
--- a/kernel/arch/risc-v/nuclei/gcc/los_arch_context.h
+++ b/kernel/arch/risc-v/nuclei/gcc/los_arch_context.h
@@ -90,4 +90,4 @@ extern VOID HalStartToRun(VOID);
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-#endif /* _LOS_HW_H */
+#endif /* _LOS_ARCH_CONTEXT_H */
diff --git a/kernel/arch/risc-v/nuclei/gcc/los_context.c b/kernel/arch/risc-v/nuclei/gcc/los_context.c
index 298a744d..a7435b2a 100644
--- a/kernel/arch/risc-v/nuclei/gcc/los_context.c
+++ b/kernel/arch/risc-v/nuclei/gcc/los_context.c
@@ -32,12 +32,6 @@ extern VOID HalHwiInit(VOID);
 #define INITIAL_MSTATUS                 ( MSTATUS_MPP | MSTATUS_MPIE | MSTATUS_FS_INITIAL)
 #define ALIGN_DOWN(size, align)         ((size) & ~((align) - 1))
 
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
 LITE_OS_SEC_TEXT_INIT VOID HalArchInit(VOID)
 {
     UINT32 ret;
@@ -105,8 +99,3 @@ VOID HalTaskSwitch(VOID)
     g_losTask.runTask = g_losTask.newTask;
 }
 
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __cplusplus */
diff --git a/kernel/arch/risc-v/nuclei/gcc/los_interrupt.c b/kernel/arch/risc-v/nuclei/gcc/los_interrupt.c
index f096ae78..5986a2d0 100644
--- a/kernel/arch/risc-v/nuclei/gcc/los_interrupt.c
+++ b/kernel/arch/risc-v/nuclei/gcc/los_interrupt.c
@@ -37,12 +37,6 @@
 #include "los_debug.h"
 #include "nuclei_sdk_hal.h"
 
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
 UINT32 g_intCount = 0;
 
 // LosExcInfo g_excInfo;
@@ -188,8 +182,3 @@ __attribute__((always_inline)) inline UINT32 HalIsIntActive(VOID)
     return (g_intCount > 0);
 }
 
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __cplusplus */
diff --git a/kernel/arch/risc-v/nuclei/gcc/los_timer.c b/kernel/arch/risc-v/nuclei/gcc/los_timer.c
index 6faffcde..6cb730b0 100644
--- a/kernel/arch/risc-v/nuclei/gcc/los_timer.c
+++ b/kernel/arch/risc-v/nuclei/gcc/los_timer.c
@@ -39,12 +39,6 @@
 #include "los_arch_timer.h"
 #include "nuclei_sdk_hal.h"
 
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
 #define configKERNEL_INTERRUPT_PRIORITY         0
 
 #define SYSTICK_TICK_CONST  (SOC_TIMER_FREQ / LOSCFG_BASE_CORE_TICK_PER_SECOND)
@@ -116,8 +110,3 @@ UINT32 HalEnterSleep(VOID)
     return LOS_OK;
 }
 
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __cplusplus */
diff --git a/kernel/arch/xtensa/lx6/gcc/los_arch_atomic.h b/kernel/arch/xtensa/lx6/gcc/los_arch_atomic.h
index e2e51143..0a51c9e9 100644
--- a/kernel/arch/xtensa/lx6/gcc/los_arch_atomic.h
+++ b/kernel/arch/xtensa/lx6/gcc/los_arch_atomic.h
@@ -79,7 +79,8 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
- * <li>The value which v point to must not be INT_MIN to avoid overflow after reducing 1.</li></ul>
+ * <li>The value which v point to must not be INT_MIN to avoid overflow after reducing 1.</li>
+ * </ul>
  *
  * @param  v      [IN] The addSelf variable pointer.
  *
diff --git a/kernel/arch/xtensa/lx6/gcc/los_interrupt.c b/kernel/arch/xtensa/lx6/gcc/los_interrupt.c
index 493e64fa..e15a8d46 100644
--- a/kernel/arch/xtensa/lx6/gcc/los_interrupt.c
+++ b/kernel/arch/xtensa/lx6/gcc/los_interrupt.c
@@ -59,7 +59,7 @@ typedef struct {
 
 /* *
  * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
+ * Hardware interrupt handler form mapping handling function array.
  */
 STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
 
@@ -79,7 +79,7 @@ VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
 #else
 /* *
  * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
+ * hardware interrupt handler form mapping handling function array.
  */
 STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};