From 70ebb57f2829b8e823a4e4cb7490de8e646b1451 Mon Sep 17 00:00:00 2001 From: YOUR_NAME Date: Tue, 23 Mar 2021 15:30:25 +0800 Subject: [PATCH] Fix CodingStyle. Change-Id: Ib76b61c7f22b8a978a4f36e398198f2e8ec0507b --- .../arch/arm/cortex-m3/keil/los_interrupt.c | 27 ++++++++++--------- .../arch/arm/cortex-m33/gcc/los_interrupt.c | 26 +++++++++--------- kernel/arch/arm/cortex-m4/gcc/los_interrupt.c | 26 +++++++++--------- kernel/arch/arm/cortex-m4/iar/los_interrupt.c | 26 +++++++++--------- kernel/arch/arm/cortex-m7/gcc/los_interrupt.c | 26 +++++++++--------- kernel/arch/arm/cortex-m7/iar/los_interrupt.c | 26 +++++++++--------- kernel/src/los_task.c | 12 ++++----- 7 files changed, 85 insertions(+), 84 deletions(-) diff --git a/kernel/arch/arm/cortex-m3/keil/los_interrupt.c b/kernel/arch/arm/cortex-m3/keil/los_interrupt.c index 40c685a4..54756f26 100755 --- a/kernel/arch/arm/cortex-m3/keil/los_interrupt.c +++ b/kernel/arch/arm/cortex-m3/keil/los_interrupt.c @@ -29,6 +29,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "los_interrupt.h" +#include "ARMCM3.h" #include #include "securec.h" #include "los_context.h" @@ -341,19 +342,19 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) { - PRINTK("Current task info:\n"); - if (excInfo->phase == OS_EXC_IN_TASK) { - LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); - PRINTK("Task name = %s\n", taskCB->taskName); - PRINTK("Task ID = %d\n", taskCB->taskID); - PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); - PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); - PRINTK("Task SS = 0x%x\n", taskCB->stackSize); - } else if (excInfo->phase == OS_EXC_IN_HWI) { - PRINTK("Exception occur in interrupt phase!\n"); - } else { - PRINTK("Exception occur in system init phase!\n"); - } + PRINTK("Current task info:\n"); + if (excInfo->phase == OS_EXC_IN_TASK) { + LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); + PRINTK("Task name = %s\n", taskCB->taskName); + PRINTK("Task ID = %d\n", taskCB->taskID); + PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); + PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); + PRINTK("Task SS = 0x%x\n", taskCB->stackSize); + } else if (excInfo->phase == OS_EXC_IN_HWI) { + PRINTK("Exception occur in interrupt phase!\n"); + } else { + PRINTK("Exception occur in system init phase!\n"); + } } STATIC VOID OsExcRegInfo(const ExcInfo *excInfo) diff --git a/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c b/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c index 7b27f77a..42d1d414 100755 --- a/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c +++ b/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c @@ -331,19 +331,19 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) { - PRINTK("Current task info:\n"); - if (excInfo->phase == OS_EXC_IN_TASK) { - LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); - PRINTK("Task name = %s\n", taskCB->taskName); - PRINTK("Task ID = %d\n", taskCB->taskID); - PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); - PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); - PRINTK("Task SS = 0x%x\n", taskCB->stackSize); - } else if (excInfo->phase == OS_EXC_IN_HWI) { - PRINTK("Exception occur in interrupt phase!\n"); - } else { - PRINTK("Exception occur in system init phase!\n"); - } + PRINTK("Current task info:\n"); + if (excInfo->phase == OS_EXC_IN_TASK) { + LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); + PRINTK("Task name = %s\n", taskCB->taskName); + PRINTK("Task ID = %d\n", taskCB->taskID); + PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); + PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); + PRINTK("Task SS = 0x%x\n", taskCB->stackSize); + } else if (excInfo->phase == OS_EXC_IN_HWI) { + PRINTK("Exception occur in interrupt phase!\n"); + } else { + PRINTK("Exception occur in system init phase!\n"); + } } STATIC VOID OsExcRegInfo(const ExcInfo *excInfo) diff --git a/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c b/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c index a569725c..a6b6cbba 100644 --- a/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c +++ b/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c @@ -341,19 +341,19 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) { - PRINTK("Current task info:\n"); - if (excInfo->phase == OS_EXC_IN_TASK) { - LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); - PRINTK("Task name = %s\n", taskCB->taskName); - PRINTK("Task ID = %d\n", taskCB->taskID); - PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); - PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); - PRINTK("Task SS = 0x%x\n", taskCB->stackSize); - } else if (excInfo->phase == OS_EXC_IN_HWI) { - PRINTK("Exception occur in interrupt phase!\n"); - } else { - PRINTK("Exception occur in system init phase!\n"); - } + PRINTK("Current task info:\n"); + if (excInfo->phase == OS_EXC_IN_TASK) { + LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); + PRINTK("Task name = %s\n", taskCB->taskName); + PRINTK("Task ID = %d\n", taskCB->taskID); + PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); + PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); + PRINTK("Task SS = 0x%x\n", taskCB->stackSize); + } else if (excInfo->phase == OS_EXC_IN_HWI) { + PRINTK("Exception occur in interrupt phase!\n"); + } else { + PRINTK("Exception occur in system init phase!\n"); + } } STATIC VOID OsExcRegInfo(const ExcInfo *excInfo) diff --git a/kernel/arch/arm/cortex-m4/iar/los_interrupt.c b/kernel/arch/arm/cortex-m4/iar/los_interrupt.c index a569725c..a6b6cbba 100755 --- a/kernel/arch/arm/cortex-m4/iar/los_interrupt.c +++ b/kernel/arch/arm/cortex-m4/iar/los_interrupt.c @@ -341,19 +341,19 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) { - PRINTK("Current task info:\n"); - if (excInfo->phase == OS_EXC_IN_TASK) { - LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); - PRINTK("Task name = %s\n", taskCB->taskName); - PRINTK("Task ID = %d\n", taskCB->taskID); - PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); - PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); - PRINTK("Task SS = 0x%x\n", taskCB->stackSize); - } else if (excInfo->phase == OS_EXC_IN_HWI) { - PRINTK("Exception occur in interrupt phase!\n"); - } else { - PRINTK("Exception occur in system init phase!\n"); - } + PRINTK("Current task info:\n"); + if (excInfo->phase == OS_EXC_IN_TASK) { + LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); + PRINTK("Task name = %s\n", taskCB->taskName); + PRINTK("Task ID = %d\n", taskCB->taskID); + PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); + PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); + PRINTK("Task SS = 0x%x\n", taskCB->stackSize); + } else if (excInfo->phase == OS_EXC_IN_HWI) { + PRINTK("Exception occur in interrupt phase!\n"); + } else { + PRINTK("Exception occur in system init phase!\n"); + } } STATIC VOID OsExcRegInfo(const ExcInfo *excInfo) diff --git a/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c b/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c index a1aca01d..582e7eec 100755 --- a/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c +++ b/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c @@ -331,19 +331,19 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) { - PRINTK("Current task info:\n"); - if (excInfo->phase == OS_EXC_IN_TASK) { - LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); - PRINTK("Task name = %s\n", taskCB->taskName); - PRINTK("Task ID = %d\n", taskCB->taskID); - PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); - PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); - PRINTK("Task SS = 0x%x\n", taskCB->stackSize); - } else if (excInfo->phase == OS_EXC_IN_HWI) { - PRINTK("Exception occur in interrupt phase!\n"); - } else { - PRINTK("Exception occur in system init phase!\n"); - } + PRINTK("Current task info:\n"); + if (excInfo->phase == OS_EXC_IN_TASK) { + LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); + PRINTK("Task name = %s\n", taskCB->taskName); + PRINTK("Task ID = %d\n", taskCB->taskID); + PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); + PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); + PRINTK("Task SS = 0x%x\n", taskCB->stackSize); + } else if (excInfo->phase == OS_EXC_IN_HWI) { + PRINTK("Exception occur in interrupt phase!\n"); + } else { + PRINTK("Exception occur in system init phase!\n"); + } } STATIC VOID OsExcRegInfo(const ExcInfo *excInfo) diff --git a/kernel/arch/arm/cortex-m7/iar/los_interrupt.c b/kernel/arch/arm/cortex-m7/iar/los_interrupt.c index eda67f39..2abb9241 100755 --- a/kernel/arch/arm/cortex-m7/iar/los_interrupt.c +++ b/kernel/arch/arm/cortex-m7/iar/los_interrupt.c @@ -337,19 +337,19 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) { - PRINTK("Current task info:\n"); - if (excInfo->phase == OS_EXC_IN_TASK) { - LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); - PRINTK("Task name = %s\n", taskCB->taskName); - PRINTK("Task ID = %d\n", taskCB->taskID); - PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); - PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); - PRINTK("Task SS = 0x%x\n", taskCB->stackSize); - } else if (excInfo->phase == OS_EXC_IN_HWI) { - PRINTK("Exception occur in interrupt phase!\n"); - } else { - PRINTK("Exception occur in system init phase!\n"); - } + PRINTK("Current task info:\n"); + if (excInfo->phase == OS_EXC_IN_TASK) { + LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); + PRINTK("Task name = %s\n", taskCB->taskName); + PRINTK("Task ID = %d\n", taskCB->taskID); + PRINTK("Task SP = 0x%x\n", taskCB->stackPointer); + PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); + PRINTK("Task SS = 0x%x\n", taskCB->stackSize); + } else if (excInfo->phase == OS_EXC_IN_HWI) { + PRINTK("Exception occur in interrupt phase!\n"); + } else { + PRINTK("Exception occur in system init phase!\n"); + } } STATIC VOID OsExcRegInfo(const ExcInfo *excInfo) diff --git a/kernel/src/los_task.c b/kernel/src/los_task.c index 7cd51735..619c17dd 100755 --- a/kernel/src/los_task.c +++ b/kernel/src/los_task.c @@ -554,12 +554,12 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllTskInfo(VOID) #if (LOSCFG_BASE_CORE_CPUP == 1) PRINTK("%d.%d %d.%d %d.%d ", - cpuLessOneSec[taskCB->taskID].uwUsage / LOS_CPUP_PRECISION_MULT, - cpuLessOneSec[taskCB->taskID].uwUsage % LOS_CPUP_PRECISION_MULT, - cpuTenSec[taskCB->taskID].uwUsage / LOS_CPUP_PRECISION_MULT, - cpuTenSec[taskCB->taskID].uwUsage % LOS_CPUP_PRECISION_MULT, - cpuOneSec[taskCB->taskID].uwUsage / LOS_CPUP_PRECISION_MULT, - cpuOneSec[taskCB->taskID].uwUsage % LOS_CPUP_PRECISION_MULT); + cpuLessOneSec[taskCB->taskID].uwUsage / LOS_CPUP_PRECISION_MULT, + cpuLessOneSec[taskCB->taskID].uwUsage % LOS_CPUP_PRECISION_MULT, + cpuTenSec[taskCB->taskID].uwUsage / LOS_CPUP_PRECISION_MULT, + cpuTenSec[taskCB->taskID].uwUsage % LOS_CPUP_PRECISION_MULT, + cpuOneSec[taskCB->taskID].uwUsage / LOS_CPUP_PRECISION_MULT, + cpuOneSec[taskCB->taskID].uwUsage % LOS_CPUP_PRECISION_MULT); #endif /* LOSCFG_BASE_CORE_CPUP */ PRINTK("%s\n", taskCB->taskName); }