From 1bf61bb4b081704859ba747b29e9646752b5177a Mon Sep 17 00:00:00 2001 From: zhangyan Date: Thu, 21 Apr 2022 12:25:36 +0000 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E6=A0=B8codex=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E6=B8=85=E9=9B=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kiita Change-Id: Ie510061dd37e4bafcb208e08311f43ef3119040c --- components/backtrace/los_backtrace.c | 4 ++-- components/cpup/los_cpup.c | 8 +++---- kernel/arch/arm/arm9/gcc/los_interrupt.c | 21 +++++++++---------- .../arch/arm/cortex-m3/keil/los_interrupt.c | 17 +++++++-------- .../arm/cortex-m33/gcc/NTZ/los_interrupt.c | 17 +++++++-------- .../gcc/TZ/non_secure/los_interrupt.c | 19 ++++++++--------- .../arch/arm/cortex-m33/gcc/los_interrupt.c | 19 ++++++++--------- .../arm/cortex-m33/iar/NTZ/los_interrupt.c | 17 +++++++-------- .../iar/TZ/non_secure/los_interrupt.c | 17 +++++++-------- kernel/arch/arm/cortex-m4/gcc/los_interrupt.c | 17 +++++++-------- kernel/arch/arm/cortex-m4/iar/los_interrupt.c | 17 +++++++-------- kernel/arch/arm/cortex-m7/gcc/los_interrupt.c | 17 +++++++-------- kernel/arch/arm/cortex-m7/iar/los_interrupt.c | 17 +++++++-------- kernel/src/los_init.c | 2 +- kernel/src/los_queue.c | 4 ++-- kernel/src/los_swtmr.c | 2 +- kernel/src/los_task.c | 10 ++++----- kernel/src/mm/los_memory.c | 6 +++--- 18 files changed, 110 insertions(+), 121 deletions(-) diff --git a/components/backtrace/los_backtrace.c b/components/backtrace/los_backtrace.c index 05538f13..fea8e89c 100644 --- a/components/backtrace/los_backtrace.c +++ b/components/backtrace/los_backtrace.c @@ -151,7 +151,7 @@ STATIC INLINE UINT32 OsStackAddrGet(UINTPTR *stackStart, UINTPTR *stackEnd, UINT LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID); *stackEnd = (UINTPTR)taskCB->topOfStack + taskCB->stackSize; if ((*stackStart < (UINTPTR)taskCB->topOfStack) || (*stackStart >= *stackEnd)) { - PRINT_ERR("psp stack [0x%x, 0x%x], cur sp(0x%x) is overflow, cur task id is %d!\n", + PRINT_ERR("psp stack [0x%x, 0x%x], cur sp(0x%x) is overflow, cur task id is %u!\n", taskCB->topOfStack, *stackEnd, *stackStart, taskID); return LOS_NOK; } @@ -413,7 +413,7 @@ VOID LOS_BackTrace(VOID) if (LR[index] == 0) { break; } - PRINTK("traceback %d -- lr = 0x%x\r\n", index, LR[index]); + PRINTK("traceback %u -- lr = 0x%x\r\n", index, LR[index]); } PRINTK("----- traceback end -----\r\n"); } diff --git a/components/cpup/los_cpup.c b/components/cpup/los_cpup.c index 9c0c31ba..7cdeeacf 100644 --- a/components/cpup/los_cpup.c +++ b/components/cpup/los_cpup.c @@ -481,7 +481,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_CpupUsageMonitor(CPUP_TYPE_E type, CPUP_MODE_E PRINTK("\nSysCpuUsage in <1s: "); } ret = LOS_HistorySysCpuUsage(mode); - PRINTK("%d.%d", ret / LOS_CPUP_PRECISION_MULT, ret % LOS_CPUP_PRECISION_MULT); + PRINTK("%u.%u", ret / LOS_CPUP_PRECISION_MULT, ret % LOS_CPUP_PRECISION_MULT); break; case TASK_CPU_USAGE: @@ -495,11 +495,11 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_CpupUsageMonitor(CPUP_TYPE_E type, CPUP_MODE_E return OS_ERROR; } if (mode == CPUP_IN_10S) { - PRINTK("\nCPUusage of taskID %d in 10s: ", taskID); + PRINTK("\nCPUusage of taskID %u in 10s: ", taskID); } else if (mode == CPUP_IN_1S) { - PRINTK("\nCPUusage of taskID %d in 1s: ", taskID); + PRINTK("\nCPUusage of taskID %u in 1s: ", taskID); } else { - PRINTK("\nCPUusage of taskID %d in <1s: ", taskID); + PRINTK("\nCPUusage of taskID %u in <1s: ", taskID); } ret = LOS_HistoryTaskCpuUsage(taskID, mode); PRINTK("%u.%u", ret / LOS_CPUP_PRECISION_MULT, ret % LOS_CPUP_PRECISION_MULT); diff --git a/kernel/arch/arm/arm9/gcc/los_interrupt.c b/kernel/arch/arm/arm9/gcc/los_interrupt.c index 06d7d929..c24818e7 100644 --- a/kernel/arch/arm/arm9/gcc/los_interrupt.c +++ b/kernel/arch/arm/arm9/gcc/los_interrupt.c @@ -49,7 +49,7 @@ #define OS_INT_STATUS_ADDR (OS_INT_REG_BASE + 12) #define OS_INT_ENABLE(num) (*((volatile UINT32 *)OS_INT_ENABLE_ADDR) |= (1U << (num))) -#define OS_INT_DISABLE(num) (*((volatile UINT32 *)OS_INT_ENABLE_ADDR ) &= ~(1U << (num))) +#define OS_INT_DISABLE(num) (*((volatile UINT32 *)OS_INT_ENABLE_ADDR) &= ~(1U << (num))) #define OS_INSTR_SET_MASK 0x01000020U #define OS_ARM_INSTR_LEN 4 @@ -123,7 +123,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 HalIntNumGet(VOID) UINT32 status; READ_UINT32(status, OS_INT_STATUS_ADDR); - return (31 - CLZ(status)); + return (31 - CLZ(status)); /* 31 bit map of int */ } inline UINT32 HalIsIntActive(VOID) @@ -140,8 +140,7 @@ inline UINT32 HalIsIntActive(VOID) /*lint -e529*/ LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) { - UINT32 irqNum = HalIntNumGet(); - PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum); + PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet()); while (1) {} } @@ -272,8 +271,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) { CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; - PRINTK("Type = %d\n", excInfo->type); - PRINTK("ThrdPid = %d\n", excInfo->thrdPid); + PRINTK("Type = %u\n", excInfo->type); + PRINTK("ThrdPid = %u\n", excInfo->thrdPid); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); } @@ -284,7 +283,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) 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 ID = %u\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); @@ -328,7 +327,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo) if (LR[index] == 0) { break; } - PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); + PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]); } PRINTK("----- backtrace end -----\n"); } @@ -354,15 +353,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID) } for (i = 0; i < errCnt; i++) { - PRINTK("pool num = %d\n", i); + PRINTK("pool num = %u\n", i); PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool free = 0x%x\n", memExcInfo[i].free); - PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); + PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); - PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); + PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner); } #endif UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); diff --git a/kernel/arch/arm/cortex-m3/keil/los_interrupt.c b/kernel/arch/arm/cortex-m3/keil/los_interrupt.c index 0dee58cf..3810dd6d 100644 --- a/kernel/arch/arm/cortex-m3/keil/los_interrupt.c +++ b/kernel/arch/arm/cortex-m3/keil/los_interrupt.c @@ -133,8 +133,7 @@ inline UINT32 HalIsIntActive(VOID) /*lint -e529*/ LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) { - UINT32 irqNum = HalIntNumGet(); - PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum); + PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet()); while (1) {} } @@ -331,8 +330,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) { CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; - PRINTK("Type = %d\n", excInfo->type); - PRINTK("ThrdPid = %d\n", excInfo->thrdPid); + PRINTK("Type = %u\n", excInfo->type); + PRINTK("ThrdPid = %u\n", excInfo->thrdPid); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); } @@ -343,7 +342,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) 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 ID = %u\n", taskCB->taskID); PRINTK("Task SP = %p\n", taskCB->stackPointer); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task SS = 0x%x\n", taskCB->stackSize); @@ -389,7 +388,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo) if (LR[index] == 0) { break; } - PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); + PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]); } PRINTK("----- backtrace end -----\n"); } @@ -415,15 +414,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID) } for (i = 0; i < errCnt; i++) { - PRINTK("pool num = %d\n", i); + PRINTK("pool num = %u\n", i); PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool free = 0x%x\n", memExcInfo[i].free); - PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); + PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); - PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); + PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner); } #endif UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); 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..dc61b276 100755 --- a/kernel/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c +++ b/kernel/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c @@ -123,8 +123,7 @@ inline UINT32 HalIsIntActive(VOID) /*lint -e529*/ LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) { - UINT32 irqNum = HalIntNumGet(); - PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum); + PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet()); while (1) {} } @@ -321,8 +320,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) { CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; - PRINTK("Type = %d\n", excInfo->type); - PRINTK("ThrdPid = %d\n", excInfo->thrdPid); + PRINTK("Type = %u\n", excInfo->type); + PRINTK("ThrdPid = %u\n", excInfo->thrdPid); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); } @@ -333,7 +332,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) 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 ID = %u\n", taskCB->taskID); PRINTK("Task SP = %p\n", taskCB->stackPointer); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task SS = 0x%x\n", taskCB->stackSize); @@ -379,7 +378,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo) if (LR[index] == 0) { break; } - PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); + PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]); } PRINTK("----- backtrace end -----\n"); } @@ -405,15 +404,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID) } for (i = 0; i < errCnt; i++) { - PRINTK("pool num = %d\n", i); + PRINTK("pool num = %u\n", i); PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool free = 0x%x\n", memExcInfo[i].free); - PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); + PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); - PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); + PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner); } #endif UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); 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..1c3e455a 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 @@ -123,8 +123,7 @@ inline UINT32 HalIsIntActive(VOID) /*lint -e529*/ LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) { - UINT32 irqNum = HalIntNumGet(); - PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum); + PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet()); while (1) {} } @@ -321,8 +320,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) { CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; - PRINTK("Type = %d\n", excInfo->type); - PRINTK("ThrdPid = %d\n", excInfo->thrdPid); + PRINTK("Type = %u\n", excInfo->type); + PRINTK("ThrdPid = %u\n", excInfo->thrdPid); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); } @@ -333,7 +332,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) 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 ID = %u\n", taskCB->taskID); PRINTK("Task SP = %p\n", taskCB->stackPointer); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task SS = 0x%x\n", taskCB->stackSize); @@ -379,7 +378,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo) if (LR[index] == 0) { break; } - PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); + PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]); } PRINTK("----- backtrace end -----\n"); } @@ -405,15 +404,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID) } for (i = 0; i < errCnt; i++) { - PRINTK("pool num = %d\n", i); + PRINTK("pool num = %u\n", i); PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool free = 0x%x\n", memExcInfo[i].free); - PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); + PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); - PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); + PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner); } #endif UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); @@ -488,7 +487,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit() UINT32 index; g_hwiForm[0] = 0; /* [0] Top of Stack */ g_hwiForm[1] = 0; /* [1] reset */ - for (index = 2; index < OS_VECTOR_CNT; index++) { + for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2 Default hw handler stack start from index 2 */ g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler; } /* Exception handler register */ diff --git a/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c b/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c index c5952da6..7a836396 100644 --- a/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c +++ b/kernel/arch/arm/cortex-m33/gcc/los_interrupt.c @@ -123,8 +123,7 @@ inline UINT32 HalIsIntActive(VOID) /*lint -e529*/ LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) { - UINT32 irqNum = HalIntNumGet(); - PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum); + PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet()); while (1) {} } @@ -321,8 +320,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) { CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; - PRINTK("Type = %d\n", excInfo->type); - PRINTK("ThrdPid = %d\n", excInfo->thrdPid); + PRINTK("Type = %u\n", excInfo->type); + PRINTK("ThrdPid = %u\n", excInfo->thrdPid); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); } @@ -333,7 +332,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) 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 ID = %u\n", taskCB->taskID); PRINTK("Task SP = %p\n", taskCB->stackPointer); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task SS = 0x%x\n", taskCB->stackSize); @@ -379,7 +378,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo) if (LR[index] == 0) { break; } - PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); + PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]); } PRINTK("----- backtrace end -----\n"); } @@ -405,15 +404,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID) } for (i = 0; i < errCnt; i++) { - PRINTK("pool num = %d\n", i); + PRINTK("pool num = %u\n", i); PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool free = 0x%x\n", memExcInfo[i].free); - PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); + PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); - PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); + PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner); } #endif UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); @@ -488,7 +487,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit() UINT32 index; g_hwiForm[0] = 0; /* [0] Top of Stack */ g_hwiForm[1] = 0; /* [1] reset */ - for (index = 2; index < OS_VECTOR_CNT; index++) { + for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */ g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler; } /* Exception handler register */ 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..cd83bde2 100644 --- a/kernel/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c +++ b/kernel/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c @@ -130,8 +130,7 @@ inline UINT32 HalIsIntActive(VOID) /*lint -e529*/ LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) { - UINT32 irqNum = HalIntNumGet(); - PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum); + PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet()); while (1) {} } @@ -330,8 +329,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) { CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; - PRINTK("Type = %d\n", excInfo->type); - PRINTK("ThrdPid = %d\n", excInfo->thrdPid); + PRINTK("Type = %u\n", excInfo->type); + PRINTK("ThrdPid = %u\n", excInfo->thrdPid); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); } @@ -342,7 +341,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) 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 ID = %u\n", taskCB->taskID); PRINTK("Task SP = %p\n", taskCB->stackPointer); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task SS = 0x%x\n", taskCB->stackSize); @@ -388,7 +387,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo) if (LR[index] == 0) { break; } - PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); + PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]); } PRINTK("----- backtrace end -----\n"); } @@ -414,15 +413,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID) } for (i = 0; i < errCnt; i++) { - PRINTK("pool num = %d\n", i); + PRINTK("pool num = %u\n", i); PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool free = 0x%x\n", memExcInfo[i].free); - PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); + PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); - PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); + PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner); } #endif UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); 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..f30e76f0 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 @@ -130,8 +130,7 @@ inline UINT32 HalIsIntActive(VOID) /*lint -e529*/ LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) { - UINT32 irqNum = HalIntNumGet(); - PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum); + PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, HalIntNumGet()); while (1) {} } @@ -330,8 +329,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) { CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; - PRINTK("Type = %d\n", excInfo->type); - PRINTK("ThrdPid = %d\n", excInfo->thrdPid); + PRINTK("Type = %u\n", excInfo->type); + PRINTK("ThrdPid = %u\n", excInfo->thrdPid); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); } @@ -342,7 +341,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) 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 ID = %u\n", taskCB->taskID); PRINTK("Task SP = %p\n", taskCB->stackPointer); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task SS = 0x%x\n", taskCB->stackSize); @@ -388,7 +387,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo) if (LR[index] == 0) { break; } - PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); + PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]); } PRINTK("----- backtrace end -----\n"); } @@ -414,15 +413,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID) } for (i = 0; i < errCnt; i++) { - PRINTK("pool num = %d\n", i); + PRINTK("pool num = %u\n", i); PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool free = 0x%x\n", memExcInfo[i].free); - PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); + PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); - PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); + PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner); } #endif UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); diff --git a/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c b/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c index 6ab35187..c307991e 100644 --- a/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c +++ b/kernel/arch/arm/cortex-m4/gcc/los_interrupt.c @@ -133,8 +133,7 @@ inline UINT32 HalIsIntActive(VOID) /*lint -e529*/ LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) { - UINT32 irqNum = HalIntNumGet(); - PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum); + PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet()); while (1) {} } @@ -331,8 +330,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) { CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; - PRINTK("Type = %d\n", excInfo->type); - PRINTK("ThrdPid = %d\n", excInfo->thrdPid); + PRINTK("Type = %u\n", excInfo->type); + PRINTK("ThrdPid = %u\n", excInfo->thrdPid); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); } @@ -343,7 +342,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) 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 ID = %u\n", taskCB->taskID); PRINTK("Task SP = %p\n", taskCB->stackPointer); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task SS = 0x%x\n", taskCB->stackSize); @@ -389,7 +388,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo) if (LR[index] == 0) { break; } - PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); + PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]); } PRINTK("----- backtrace end -----\n"); } @@ -415,15 +414,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID) } for (i = 0; i < errCnt; i++) { - PRINTK("pool num = %d\n", i); + PRINTK("pool num = %u\n", i); PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool free = 0x%x\n", memExcInfo[i].free); - PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); + PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); - PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); + PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner); } #endif UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); diff --git a/kernel/arch/arm/cortex-m4/iar/los_interrupt.c b/kernel/arch/arm/cortex-m4/iar/los_interrupt.c index cd7ff15c..6584e96c 100644 --- a/kernel/arch/arm/cortex-m4/iar/los_interrupt.c +++ b/kernel/arch/arm/cortex-m4/iar/los_interrupt.c @@ -134,8 +134,7 @@ inline UINT32 HalIsIntActive(VOID) /*lint -e529*/ LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) { - UINT32 irqNum = HalIntNumGet(); - PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum); + PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet()); while (1) {} } @@ -334,8 +333,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) { CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; - PRINTK("Type = %d\n", excInfo->type); - PRINTK("ThrdPid = %d\n", excInfo->thrdPid); + PRINTK("Type = %u\n", excInfo->type); + PRINTK("ThrdPid = %u\n", excInfo->thrdPid); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); } @@ -346,7 +345,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) 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 ID = %u\n", taskCB->taskID); PRINTK("Task SP = %p\n", taskCB->stackPointer); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task SS = 0x%x\n", taskCB->stackSize); @@ -392,7 +391,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo) if (LR[index] == 0) { break; } - PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); + PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]); } PRINTK("----- backtrace end -----\n"); } @@ -418,15 +417,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID) } for (i = 0; i < errCnt; i++) { - PRINTK("pool num = %d\n", i); + PRINTK("pool num = %u\n", i); PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool free = 0x%x\n", memExcInfo[i].free); - PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); + PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); - PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); + PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner); } #endif UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); diff --git a/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c b/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c index e1eb52e3..dce2e81f 100644 --- a/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c +++ b/kernel/arch/arm/cortex-m7/gcc/los_interrupt.c @@ -123,8 +123,7 @@ inline UINT32 HalIsIntActive(VOID) /*lint -e529*/ LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) { - UINT32 irqNum = HalIntNumGet(); - PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum); + PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet()); while (1) {} } @@ -321,8 +320,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) { CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; - PRINTK("Type = %d\n", excInfo->type); - PRINTK("ThrdPid = %d\n", excInfo->thrdPid); + PRINTK("Type = %u\n", excInfo->type); + PRINTK("ThrdPid = %u\n", excInfo->thrdPid); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); } @@ -333,7 +332,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) 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 ID = %u\n", taskCB->taskID); PRINTK("Task SP = %p\n", taskCB->stackPointer); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task SS = 0x%x\n", taskCB->stackSize); @@ -379,7 +378,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo) if (LR[index] == 0) { break; } - PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); + PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]); } PRINTK("----- backtrace end -----\n"); } @@ -405,15 +404,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID) } for (i = 0; i < errCnt; i++) { - PRINTK("pool num = %d\n", i); + PRINTK("pool num = %u\n", i); PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool free = 0x%x\n", memExcInfo[i].free); - PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); + PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); - PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); + PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner); } #endif UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); diff --git a/kernel/arch/arm/cortex-m7/iar/los_interrupt.c b/kernel/arch/arm/cortex-m7/iar/los_interrupt.c index 6c5adc22..2bb3be7e 100644 --- a/kernel/arch/arm/cortex-m7/iar/los_interrupt.c +++ b/kernel/arch/arm/cortex-m7/iar/los_interrupt.c @@ -130,8 +130,7 @@ inline UINT32 HalIsIntActive(VOID) /*lint -e529*/ LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID) { - UINT32 irqNum = HalIntNumGet(); - PRINT_ERR("%s irqnum:%d\n", __FUNCTION__, irqNum); + PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HalIntNumGet()); while (1) {} } @@ -330,8 +329,8 @@ STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo) { CHAR *phaseStr[] = {"exc in init", "exc in task", "exc in hwi"}; - PRINTK("Type = %d\n", excInfo->type); - PRINTK("ThrdPid = %d\n", excInfo->thrdPid); + PRINTK("Type = %u\n", excInfo->type); + PRINTK("ThrdPid = %u\n", excInfo->thrdPid); PRINTK("Phase = %s\n", phaseStr[excInfo->phase]); PRINTK("FaultAddr = 0x%x\n", excInfo->faultAddr); } @@ -342,7 +341,7 @@ STATIC VOID OsExcCurTaskInfo(const ExcInfo *excInfo) 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 ID = %u\n", taskCB->taskID); PRINTK("Task SP = %p\n", taskCB->stackPointer); PRINTK("Task ST = 0x%x\n", taskCB->topOfStack); PRINTK("Task SS = 0x%x\n", taskCB->stackSize); @@ -388,7 +387,7 @@ STATIC VOID OsExcBackTraceInfo(const ExcInfo *excInfo) if (LR[index] == 0) { break; } - PRINTK("backtrace %d -- lr = 0x%x\n", index, LR[index]); + PRINTK("backtrace %u -- lr = 0x%x\n", index, LR[index]); } PRINTK("----- backtrace end -----\n"); } @@ -414,15 +413,15 @@ STATIC VOID OsExcMemPoolCheckInfo(VOID) } for (i = 0; i < errCnt; i++) { - PRINTK("pool num = %d\n", i); + PRINTK("pool num = %u\n", i); PRINTK("pool type = %d\n", memExcInfo[i].type); PRINTK("pool addr = 0x%x\n", memExcInfo[i].startAddr); PRINTK("pool size = 0x%x\n", memExcInfo[i].size); PRINTK("pool free = 0x%x\n", memExcInfo[i].free); - PRINTK("pool blkNum = %d\n", memExcInfo[i].blockSize); + PRINTK("pool blkNum = %u\n", memExcInfo[i].blockSize); PRINTK("pool error node addr = 0x%x\n", memExcInfo[i].errorAddr); PRINTK("pool error node len = 0x%x\n", memExcInfo[i].errorLen); - PRINTK("pool error node owner = %d\n", memExcInfo[i].errorOwner); + PRINTK("pool error node owner = %u\n", memExcInfo[i].errorOwner); } #endif UINT32 ret = LOS_MemIntegrityCheck(LOSCFG_SYS_HEAP_ADDR); diff --git a/kernel/src/los_init.c b/kernel/src/los_init.c index 4d081fd4..9b46770c 100644 --- a/kernel/src/los_init.c +++ b/kernel/src/los_init.c @@ -127,7 +127,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_KernelInit(VOID) OsRegister(); ret = OsMemSystemInit(); if (ret != LOS_OK) { - PRINT_ERR("OsMemSystemInit error %d\n", ret); + PRINT_ERR("OsMemSystemInit error %u\n", ret); return ret; } diff --git a/kernel/src/los_queue.c b/kernel/src/los_queue.c index 0245429a..56182456 100644 --- a/kernel/src/los_queue.c +++ b/kernel/src/los_queue.c @@ -243,7 +243,7 @@ static INLINE VOID OsQueueBufferOperate(LosQueueCB *queueCB, UINT32 operateType, msgDataSize = *((UINT32 *)(UINTPTR)((queueNode + queueCB->queueSize) - sizeof(UINT32))); rc = memcpy_s((VOID *)bufferAddr, *bufferSize, (VOID *)queueNode, msgDataSize); if (rc != EOK) { - PRINT_ERR("%s[%d] memcpy failed, error type = %u\n", __FUNCTION__, __LINE__, rc); + PRINT_ERR("%s[%d] memcpy failed, error type = %d\n", __FUNCTION__, __LINE__, rc); return; } @@ -252,7 +252,7 @@ static INLINE VOID OsQueueBufferOperate(LosQueueCB *queueCB, UINT32 operateType, *((UINT32 *)(UINTPTR)((queueNode + queueCB->queueSize) - sizeof(UINT32))) = *bufferSize; rc = memcpy_s((VOID *)queueNode, queueCB->queueSize, (VOID *)bufferAddr, *bufferSize); if (rc != EOK) { - PRINT_ERR("%s[%d] memcpy failed, error type = %u\n", __FUNCTION__, __LINE__, rc); + PRINT_ERR("%s[%d] memcpy failed, error type = %d\n", __FUNCTION__, __LINE__, rc); return; } } diff --git a/kernel/src/los_swtmr.c b/kernel/src/los_swtmr.c index 8f0ed3b9..035cd2e1 100644 --- a/kernel/src/los_swtmr.c +++ b/kernel/src/los_swtmr.c @@ -88,7 +88,7 @@ LITE_OS_SEC_TEXT VOID OsSwtmrTask(VOID) tick = LOS_TickCountGet() - tick; if (tick >= SWTMR_MAX_RUNNING_TICKS) { - PRINT_WARN("timer_handler(%p) cost too many ms(%d)\n", + PRINT_WARN("timer_handler(%p) cost too many ms(%u)\n", swtmrHandle.handler, (UINT32)((tick * OS_SYS_MS_PER_SECOND) / LOSCFG_BASE_CORE_TICK_PER_SECOND)); } diff --git a/kernel/src/los_task.c b/kernel/src/los_task.c index a834e334..3cb414b2 100644 --- a/kernel/src/los_task.c +++ b/kernel/src/los_task.c @@ -343,7 +343,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllTskInfo(VOID) continue; } - PRINTK("%d %d %s 0x%x 0x%x 0x%x 0x%x 0x%x ", + PRINTK("%u %u %s 0x%x 0x%x 0x%x 0x%x 0x%x ", taskCB->taskID, taskCB->priority, OsConvertTskStatus(taskCB->taskStatus), taskCB->stackSize, OsGetTaskWaterLine(taskCB->taskID), (UINT32)(UINTPTR)taskCB->stackPointer, taskCB->topOfStack, taskCB->eventMask); @@ -352,7 +352,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllTskInfo(VOID) PRINTK("0x%x ", semID); #if (LOSCFG_BASE_CORE_CPUP == 1) - PRINTK("%d.%d %d.%d %d.%d ", + PRINTK("%u.%u %u.%u %u.%u ", cpuLessOneSec[taskCB->taskID].uwUsage / LOS_CPUP_PRECISION_MULT, cpuLessOneSec[taskCB->taskID].uwUsage % LOS_CPUP_PRECISION_MULT, cpuTenSec[taskCB->taskID].uwUsage / LOS_CPUP_PRECISION_MULT, @@ -498,7 +498,7 @@ LITE_OS_SEC_TEXT CHAR *LOS_CurTaskNameGet(VOID) *****************************************************************************/ LITE_OS_SEC_TEXT STATIC VOID OsHandleRunTaskStackOverflow(VOID) { - PRINT_ERR("CURRENT task ID: %s:%d stack overflow!\n", + PRINT_ERR("CURRENT task ID: %s:%u stack overflow!\n", g_losTask.runTask->taskName, g_losTask.runTask->taskID); OsDoExcHook(EXC_STACKOVERFLOW); } @@ -514,7 +514,7 @@ LITE_OS_SEC_TEXT STATIC VOID OsHandleNewTaskStackOverflow(VOID) { LosTaskCB *tmp = NULL; - PRINT_ERR("HIGHEST task ID: %s:%d SP error!\n", + PRINT_ERR("HIGHEST task ID: %s:%u SP error!\n", g_losTask.newTask->taskName, g_losTask.newTask->taskID); PRINT_ERR("HIGHEST task StackPointer: 0x%x TopOfStack: 0x%x\n", (UINT32)(UINTPTR)(g_losTask.newTask->stackPointer), g_losTask.newTask->topOfStack); @@ -633,7 +633,7 @@ LITE_OS_SEC_TEXT_INIT VOID OsTaskEntry(UINT32 taskID) taskCB->joinRetval = (UINTPTR)taskCB->taskEntry(taskCB->arg); retVal = LOS_TaskDelete(taskCB->taskID); if (retVal != LOS_OK) { - PRINT_ERR("Delete Task[TID: %d] Failed!\n", taskCB->taskID); + PRINT_ERR("Delete Task[TID: %u] Failed!\n", taskCB->taskID); } } diff --git a/kernel/src/mm/los_memory.c b/kernel/src/mm/los_memory.c index 99e15f12..089f8d7e 100644 --- a/kernel/src/mm/los_memory.c +++ b/kernel/src/mm/los_memory.c @@ -952,7 +952,7 @@ UINT32 LOS_MemInit(VOID *pool, UINT32 size) if (((UINTPTR)pool & (OS_MEM_ALIGN_SIZE - 1)) || \ (size & (OS_MEM_ALIGN_SIZE - 1))) { - PRINT_ERR("LiteOS heap memory address or size configured not aligned:address:0x%x,size:0x%x, alignsize:%d\n", \ + PRINT_ERR("LiteOS heap memory address or size configured not aligned:address:0x%x,size:0x%x, alignsize:%u\n", \ (UINTPTR)pool, size, OS_MEM_ALIGN_SIZE); return OS_ERROR; } @@ -1788,8 +1788,8 @@ STATIC VOID OsMemIntegrityCheckError(struct OsMemPoolHead *pool, PRINTK("The prev node is free\n"); } MEM_UNLOCK(pool, intSave); - PRINT_ERR("cur node: 0x%x, pre node: 0x%x, pre node was allocated by task: %d, %s\n", - tmpNode, preNode, taskCB->taskID, taskCB->taskName); + PRINT_ERR("cur node: 0x%x, pre node: 0x%x, pre node was allocated by task: %u, %s\n", + (UINTPTR)tmpNode, (UINTPTR)preNode, taskCB->taskID, taskCB->taskName); LOS_Panic("Memory integrity check error!\n"); #else MEM_UNLOCK(pool, intSave);