yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 内源检视修复 

Signed-off-by: arvinzzz <zhaotianyu9@huawei.com>
Change-Id: Ic8f63a512a5b2c88e7abee6c167473f37ecc9f3b
This commit is contained in:
arvinzzz 2022-03-21 11:02:16 +08:00
parent 57a0002252
commit 17daa50fa2
39 changed files with 87 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Kconfig
View File

@ -369,7 +369,7 @@ config KERNEL_LMK
default n default n
depends on KERNEL_EXTKERNEL depends on KERNEL_EXTKERNEL
help help
Configuration item for low momery killer tailoring. Configuration item for low memory killer tailoring.
If you wish to build LiteOS with support for low memory killer. If you wish to build LiteOS with support for low memory killer.
config KERNEL_LMK_DEBUG config KERNEL_LMK_DEBUG
@ -574,7 +574,7 @@ config MEM_LEAKCHECK
depends on DEBUG_VERSION && MEM_DEBUG depends on DEBUG_VERSION && MEM_DEBUG
select KERNEL_BACKTRACE select KERNEL_BACKTRACE
help help
Answer Y to enable record the LR of Function call stack of Mem operation, it can check the mem leak through the infomations of mem node. Answer Y to enable record the LR of Function call stack of Mem operation, it can check the mem leak through the informations of mem node.
config BASE_MEM_NODE_INTEGRITY_CHECK config BASE_MEM_NODE_INTEGRITY_CHECK
bool "Enable integrity check or not" bool "Enable integrity check or not"
default n default n

8
arch/arm/cortex-m3/keil/los_exc.S
View File

@ -190,7 +190,7 @@ _hwiActiveCheck
CMP R3, #0 CMP R3, #0
BEQ _hwiActiveCheckNext BEQ _hwiActiveCheckNext
; exc occured in IRQ ; exc occurred in IRQ
ORR R0, R0, #FLAG_HWI_ACTIVE ORR R0, R0, #FLAG_HWI_ACTIVE
RBIT R2, R3 RBIT R2, R3
CLZ R2, R2 CLZ R2, R2
@ -228,19 +228,19 @@ _hwiActiveCheckNext
AND R2, R2,R3 AND R2, R2,R3
CMP R2,#0 CMP R2,#0
BNE _ExcInMSP BNE _ExcInMSP
; exc occured in Task or Init or exc ; exc occurred in Task or Init or exc
; reserved for register info from task stack ; reserved for register info from task stack
LDR R2, =g_taskScheduled LDR R2, =g_taskScheduled
LDR R2, [R2] 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 BEQ _ExcInMSP ; if exc occurred in Init then branch
CMP LR, #0xFFFFFFED ;auto push floating registers CMP LR, #0xFFFFFFED ;auto push floating registers
BNE _NoFloatInPsp BNE _NoFloatInPsp
; exc occured in Task ; exc occurred in Task
MOV R2, R13 MOV R2, R13
SUB R13, #96 ; add 8 Bytes reg(for STMFD) SUB R13, #96 ; add 8 Bytes reg(for STMFD)

8
arch/arm/cortex-m33/gcc/NTZ/los_exc.S
View File

@ -263,7 +263,7 @@ _hwiActiveCheck:
CMP R3, #0 CMP R3, #0
BEQ _hwiActiveCheckNext BEQ _hwiActiveCheckNext
// exc occured in IRQ // exc occurred in IRQ
ORR R0, R0, #FLAG_HWI_ACTIVE ORR R0, R0, #FLAG_HWI_ACTIVE
RBIT R2, R3 RBIT R2, R3
CLZ R2, R2 CLZ R2, R2
@ -316,19 +316,19 @@ _hwiActiveCheckNext:
AND R2, R2,R3 AND R2, R2,R3
CMP R2,#0 CMP R2,#0
BNE _ExcInMSP BNE _ExcInMSP
// exc occured in Task or Init or exc // exc occurred in Task or Init or exc
// reserved for register info from task stack // reserved for register info from task stack
LDR R2, =g_taskScheduled LDR R2, =g_taskScheduled
LDR R2, [R2] 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 BEQ _ExcInMSP // if exc occurred in Init then branch
CMP LR, #0xFFFFFFED //auto push floating registers CMP LR, #0xFFFFFFED //auto push floating registers
BNE _NoFloatInPsp BNE _NoFloatInPsp
// exc occured in Task // exc occurred in Task
MOV R2, R13 MOV R2, R13
SUB R13, #96 // add 8 Bytes reg(for STMFD) SUB R13, #96 // add 8 Bytes reg(for STMFD)

8
arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S
View File

@ -247,7 +247,7 @@ _hwiActiveCheck:
CMP R3, #0 CMP R3, #0
BEQ _hwiActiveCheckNext BEQ _hwiActiveCheckNext
// exc occured in IRQ // exc occurred in IRQ
ORR R0, R0, #FLAG_HWI_ACTIVE ORR R0, R0, #FLAG_HWI_ACTIVE
RBIT R2, R3 RBIT R2, R3
CLZ R2, R2 CLZ R2, R2
@ -300,19 +300,19 @@ _hwiActiveCheckNext:
AND R2, R2,R3 AND R2, R2,R3
CMP R2,#0 CMP R2,#0
BNE _ExcInMSP BNE _ExcInMSP
// exc occured in Task or Init or exc // exc occurred in Task or Init or exc
// reserved for register info from task stack // reserved for register info from task stack
LDR R2, =g_taskScheduled LDR R2, =g_taskScheduled
LDR R2, [R2] 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 BEQ _ExcInMSP // if exc occurred in Init then branch
CMP LR, #0xFFFFFFED //auto push floating registers CMP LR, #0xFFFFFFED //auto push floating registers
BNE _NoFloatInPsp BNE _NoFloatInPsp
// exc occured in Task // exc occurred in Task
MOV R2, R13 MOV R2, R13
SUB R13, #96 // add 8 Bytes reg(for STMFD) SUB R13, #96 // add 8 Bytes reg(for STMFD)

12
arch/arm/cortex-m33/iar/NTZ/los_exc.S
View File

@ -56,8 +56,8 @@ FLAG_ADDR_VALID EQU 0x10000
FLAG_HWI_ACTIVE EQU 0x20000 FLAG_HWI_ACTIVE EQU 0x20000
FLAG_NO_FLOAT EQU 0x10000000 FLAG_NO_FLOAT EQU 0x10000000
OS_NVIC_FSR EQU 0xE000ED28 ;include BusFault/MemFault/UsageFault State Regeister OS_NVIC_FSR EQU 0xE000ED28 ;include BusFault/MemFault/UsageFault State Register
OS_NVIC_HFSR EQU 0xE000ED2C ;HardFault State Regeister OS_NVIC_HFSR EQU 0xE000ED2C ;HardFault State Register
OS_NVIC_BFAR EQU 0xE000ED38 OS_NVIC_BFAR EQU 0xE000ED38
OS_NVIC_MMAR EQU 0xE000ED34 OS_NVIC_MMAR EQU 0xE000ED34
OS_NVIC_ACT_BASE EQU 0xE000E300 OS_NVIC_ACT_BASE EQU 0xE000E300
@ -190,7 +190,7 @@ _hwiActiveCheck
CMP R3, #0 CMP R3, #0
BEQ _hwiActiveCheckNext BEQ _hwiActiveCheckNext
; exc occured in IRQ ; exc occurred in IRQ
ORR R0, R0, #FLAG_HWI_ACTIVE ORR R0, R0, #FLAG_HWI_ACTIVE
RBIT R2, R3 RBIT R2, R3
CLZ R2, R2 CLZ R2, R2
@ -228,19 +228,19 @@ _hwiActiveCheckNext
AND R2, R2,R3 AND R2, R2,R3
CMP R2,#0 CMP R2,#0
BNE _ExcInMSP BNE _ExcInMSP
; exc occured in Task or Init or exc ; exc occurred in Task or Init or exc
; reserved for register info from task stack ; reserved for register info from task stack
LDR R2, =g_taskScheduled LDR R2, =g_taskScheduled
LDR R2, [R2] 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 BEQ _ExcInMSP ; if exc occurred in Init then branch
CMP LR, #0xFFFFFFED ;auto push floating registers CMP LR, #0xFFFFFFED ;auto push floating registers
BNE _NoFloatInPsp BNE _NoFloatInPsp
; exc occured in Task ; exc occurred in Task
MOV R2, R13 MOV R2, R13
SUB R13, #96 ; add 8 Bytes reg(for STMFD) SUB R13, #96 ; add 8 Bytes reg(for STMFD)

12
arch/arm/cortex-m33/iar/TZ/non_secure/los_exc.S
View File

@ -55,8 +55,8 @@ FLAG_ADDR_VALID EQU 0x10000
FLAG_HWI_ACTIVE EQU 0x20000 FLAG_HWI_ACTIVE EQU 0x20000
FLAG_NO_FLOAT EQU 0x10000000 FLAG_NO_FLOAT EQU 0x10000000
OS_NVIC_FSR EQU 0xE000ED28 ;include BusFault/MemFault/UsageFault State Regeister OS_NVIC_FSR EQU 0xE000ED28 ;include BusFault/MemFault/UsageFault State Register
OS_NVIC_HFSR EQU 0xE000ED2C ;HardFault State Regeister OS_NVIC_HFSR EQU 0xE000ED2C ;HardFault State Register
OS_NVIC_BFAR EQU 0xE000ED38 OS_NVIC_BFAR EQU 0xE000ED38
OS_NVIC_MMAR EQU 0xE000ED34 OS_NVIC_MMAR EQU 0xE000ED34
OS_NVIC_ACT_BASE EQU 0xE000E300 OS_NVIC_ACT_BASE EQU 0xE000E300
@ -179,7 +179,7 @@ _hwiActiveCheck
CMP R3, #0 CMP R3, #0
BEQ _hwiActiveCheckNext BEQ _hwiActiveCheckNext
; exc occured in IRQ ; exc occurred in IRQ
ORR R0, R0, #FLAG_HWI_ACTIVE ORR R0, R0, #FLAG_HWI_ACTIVE
RBIT R2, R3 RBIT R2, R3
CLZ R2, R2 CLZ R2, R2
@ -217,19 +217,19 @@ _hwiActiveCheckNext
AND R2, R2,R3 AND R2, R2,R3
CMP R2,#0 CMP R2,#0
BNE _ExcInMSP BNE _ExcInMSP
; exc occured in Task or Init or exc ; exc occurred in Task or Init or exc
; reserved for register info from task stack ; reserved for register info from task stack
LDR R2, =g_taskScheduled LDR R2, =g_taskScheduled
LDR R2, [R2] 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 BEQ _ExcInMSP ; if exc occurred in Init then branch
CMP LR, #0xFFFFFFED ;auto push floating registers CMP LR, #0xFFFFFFED ;auto push floating registers
BNE _NoFloatInPsp BNE _NoFloatInPsp
; exc occured in Task ; exc occurred in Task
MOV R2, R13 MOV R2, R13
SUB R13, #96 ; add 8 Bytes reg(for STMFD) SUB R13, #96 ; add 8 Bytes reg(for STMFD)

8
arch/arm/cortex-m4/gcc/los_exc.S
View File

@ -278,7 +278,7 @@ _hwiActiveCheck:
CMP R3, #0 CMP R3, #0
BEQ _hwiActiveCheckNext BEQ _hwiActiveCheckNext
// exc occured in IRQ // exc occurred in IRQ
ORR R0, R0, #FLAG_HWI_ACTIVE ORR R0, R0, #FLAG_HWI_ACTIVE
RBIT R2, R3 RBIT R2, R3
CLZ R2, R2 CLZ R2, R2
@ -331,19 +331,19 @@ _hwiActiveCheckNext:
AND R2, R2,R3 AND R2, R2,R3
CMP R2,#0 CMP R2,#0
BNE _ExcInMSP BNE _ExcInMSP
// exc occured in Task or Init or exc // exc occurred in Task or Init or exc
// reserved for register info from task stack // reserved for register info from task stack
LDR R2, =g_taskScheduled LDR R2, =g_taskScheduled
LDR R2, [R2] 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 BEQ _ExcInMSP // if exc occurred in Init then branch
CMP LR, #0xFFFFFFED //auto push floating registers CMP LR, #0xFFFFFFED //auto push floating registers
BNE _NoFloatInPsp BNE _NoFloatInPsp
// exc occured in Task // exc occurred in Task
MOV R2, R13 MOV R2, R13
SUB R13, #96 // add 8 Bytes reg(for STMFD) SUB R13, #96 // add 8 Bytes reg(for STMFD)

8
arch/arm/cortex-m4/iar/los_exc.S
View File

@ -190,7 +190,7 @@ _hwiActiveCheck
CMP R3, #0 CMP R3, #0
BEQ _hwiActiveCheckNext BEQ _hwiActiveCheckNext
; exc occured in IRQ ; exc occurred in IRQ
ORR R0, R0, #FLAG_HWI_ACTIVE ORR R0, R0, #FLAG_HWI_ACTIVE
RBIT R2, R3 RBIT R2, R3
CLZ R2, R2 CLZ R2, R2
@ -228,19 +228,19 @@ _hwiActiveCheckNext
AND R2, R2,R3 AND R2, R2,R3
CMP R2,#0 CMP R2,#0
BNE _ExcInMSP BNE _ExcInMSP
; exc occured in Task or Init or exc ; exc occurred in Task or Init or exc
; reserved for register info from task stack ; reserved for register info from task stack
LDR R2, =g_taskScheduled LDR R2, =g_taskScheduled
LDR R2, [R2] 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 BEQ _ExcInMSP ; if exc occurred in Init then branch
CMP LR, #0xFFFFFFED ;auto push floating registers CMP LR, #0xFFFFFFED ;auto push floating registers
BNE _NoFloatInPsp BNE _NoFloatInPsp
; exc occured in Task ; exc occurred in Task
MOV R2, R13 MOV R2, R13
SUB R13, #96 ; add 8 Bytes reg(for STMFD) SUB R13, #96 ; add 8 Bytes reg(for STMFD)

8
arch/arm/cortex-m55/gcc/NTZ/los_exc.S
View File

@ -260,7 +260,7 @@ _hwiActiveCheck:
CMP R3, #0 CMP R3, #0
BEQ _hwiActiveCheckNext BEQ _hwiActiveCheckNext
// exc occured in IRQ // exc occurred in IRQ
ORR R0, R0, #FLAG_HWI_ACTIVE ORR R0, R0, #FLAG_HWI_ACTIVE
RBIT R2, R3 RBIT R2, R3
CLZ R2, R2 CLZ R2, R2
@ -313,19 +313,19 @@ _hwiActiveCheckNext:
AND R2, R2, R3 AND R2, R2, R3
CMP R2, #0 CMP R2, #0
BNE _ExcInMSP BNE _ExcInMSP
// exc occured in Task or Init or exc // exc occurred in Task or Init or exc
// reserved for register info from task stack // reserved for register info from task stack
LDR R2, =g_taskScheduled LDR R2, =g_taskScheduled
LDR R2, [R2] 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 BEQ _ExcInMSP // if exc occurred in Init then branch
CMP LR, #0xFFFFFFED //auto push floating registers CMP LR, #0xFFFFFFED //auto push floating registers
BNE _NoFloatInPsp BNE _NoFloatInPsp
// exc occured in Task // exc occurred in Task
MOV R2, R13 MOV R2, R13
SUB R13, #96 // add 8 Bytes reg(for STMFD) SUB R13, #96 // add 8 Bytes reg(for STMFD)

8
arch/arm/cortex-m7/gcc/los_exc.S
View File

@ -263,7 +263,7 @@ _hwiActiveCheck:
CMP R3, #0 CMP R3, #0
BEQ _hwiActiveCheckNext BEQ _hwiActiveCheckNext
// exc occured in IRQ // exc occurred in IRQ
ORR R0, R0, #FLAG_HWI_ACTIVE ORR R0, R0, #FLAG_HWI_ACTIVE
RBIT R2, R3 RBIT R2, R3
CLZ R2, R2 CLZ R2, R2
@ -316,19 +316,19 @@ _hwiActiveCheckNext:
AND R2, R2,R3 AND R2, R2,R3
CMP R2,#0 CMP R2,#0
BNE _ExcInMSP BNE _ExcInMSP
// exc occured in Task or Init or exc // exc occurred in Task or Init or exc
// reserved for register info from task stack // reserved for register info from task stack
LDR R2, =g_taskScheduled LDR R2, =g_taskScheduled
LDR R2, [R2] 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 BEQ _ExcInMSP // if exc occurred in Init then branch
CMP LR, #0xFFFFFFED //auto push floating registers CMP LR, #0xFFFFFFED //auto push floating registers
BNE _NoFloatInPsp BNE _NoFloatInPsp
// exc occured in Task // exc occurred in Task
MOV R2, R13 MOV R2, R13
SUB R13, #96 // add 8 Bytes reg(for STMFD) SUB R13, #96 // add 8 Bytes reg(for STMFD)

8
arch/arm/cortex-m7/iar/los_exc.S
View File

@ -190,7 +190,7 @@ _hwiActiveCheck
CMP R3, #0 CMP R3, #0
BEQ _hwiActiveCheckNext BEQ _hwiActiveCheckNext
; exc occured in IRQ ; exc occurred in IRQ
ORR R0, R0, #FLAG_HWI_ACTIVE ORR R0, R0, #FLAG_HWI_ACTIVE
RBIT R2, R3 RBIT R2, R3
CLZ R2, R2 CLZ R2, R2
@ -228,19 +228,19 @@ _hwiActiveCheckNext
AND R2, R2,R3 AND R2, R2,R3
CMP R2,#0 CMP R2,#0
BNE _ExcInMSP BNE _ExcInMSP
; exc occured in Task or Init or exc ; exc occurred in Task or Init or exc
; reserved for register info from task stack ; reserved for register info from task stack
LDR R2, =g_taskScheduled LDR R2, =g_taskScheduled
LDR R2, [R2] 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 BEQ _ExcInMSP ; if exc occurred in Init then branch
CMP LR, #0xFFFFFFED ;auto push floating registers CMP LR, #0xFFFFFFED ;auto push floating registers
BNE _NoFloatInPsp BNE _NoFloatInPsp
; exc occured in Task ; exc occurred in Task
MOV R2, R13 MOV R2, R13
SUB R13, #96 ; add 8 Bytes reg(for STMFD) SUB R13, #96 ; add 8 Bytes reg(for STMFD)

2
arch/risc-v/nuclei/gcc/nmsis/Core/Include/core_feature_dsp.h
View File

@ -105,7 +105,7 @@
* Based on the types of the four 8-bit arithmetic operations, the SIMD 8-bit add/subtract instructions * Based on the types of the four 8-bit arithmetic operations, the SIMD 8-bit add/subtract instructions
* can be classified into 2 main categories: Addition (four 8-bit addition), and Subtraction (four 8-bit * can be classified into 2 main categories: Addition (four 8-bit addition), and Subtraction (four 8-bit
* subtraction). * subtraction).
* Based on the way of how an overflow condition is handled for singed or unsigned operation, the * Based on the way of how an overflow condition is handled for signed or unsigned operation, the
* SIMD 8-bit add/subtract instructions can be classified into 5 groups: Wrap-around (dropping * SIMD 8-bit add/subtract instructions can be classified into 5 groups: Wrap-around (dropping
* overflow), Signed Halving (keeping overflow by dropping 1 LSB bit), Unsigned Halving, Signed * overflow), Signed Halving (keeping overflow by dropping 1 LSB bit), Unsigned Halving, Signed
* Saturation (clipping overflow), and Unsigned Saturation. * Saturation (clipping overflow), and Unsigned Saturation.

2
arch/risc-v/riscv32/gcc/los_interrupt.c
View File

@ -332,7 +332,7 @@ VOID HalExcEntry(const LosExcContext *excBufAddr)
ExcInfoDisplay(excBufAddr); ExcInfoDisplay(excBufAddr);
if (LOS_TaskIsRunning()) { if (LOS_TaskIsRunning()) {
PRINTK("----------------All Task infomation ------------\n"); PRINTK("----------------All Task information ------------\n");
OsGetAllTskInfo(); OsGetAllTskInfo();
} }

2
components/cpup/los_cpup.c
View File

@ -82,7 +82,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsCpupInit()
/***************************************************************************** /*****************************************************************************
Function : OsTskCycleStart Function : OsTskCycleStart
Description: start task to get cycles count in current task begining Description: start task to get cycles count in current task beginning
Input : None Input : None
Return : None Return : None
*****************************************************************************/ *****************************************************************************/

2
components/dynlink/los_dynlink.h
View File

@ -169,7 +169,7 @@ VOID *LOS_SoLoad(const CHAR *fileName, VOID *pool);
VOID *LOS_FindSym(VOID *handle, const CHAR *name); VOID *LOS_FindSym(VOID *handle, const CHAR *name);
/* /*
* @brief Decrement the reference count on the loaded shared library refered to by handle. * @brief Decrement the reference count on the loaded shared library referred to by handle.
* If the reference count drops to zero, then the library is unloaded. * If the reference count drops to zero, then the library is unloaded.
* *
* This function validates that the handle is valid. * This function validates that the handle is valid.

2
components/fs/fatfs/fatfs.c
View File

@ -584,7 +584,7 @@ ssize_t FatfsWrite(struct File *file, const char *buf, size_t nbyte)
res = f_write(fp, buf, nbyte, &lenWrite); res = f_write(fp, buf, nbyte, &lenWrite);
if ((res == FR_OK) && (lenWrite == 0) && (nbyte != 0) && (overFlow == FALSE)) { if ((res == FR_OK) && (lenWrite == 0) && (nbyte != 0) && (overFlow == FALSE)) {
overFlow = TRUE; overFlow = TRUE;
PRINT_ERR("FAT write!\r\n"); PRINT_ERR("FAT write err!\r\n");
} }
if ((res != FR_OK) || (nbyte != lenWrite)) { if ((res != FR_OK) || (nbyte != lenWrite)) {

2
components/lmk/los_lmk.h
View File

@ -128,7 +128,7 @@ typedef struct {
* @param lmkNode [IN] The LosLmkOpsNode node to be registered. * @param lmkNode [IN] The LosLmkOpsNode node to be registered.
* *
* @retval LOS_OK The LosLmkOpsNode node is registered successfully. * @retval LOS_OK The LosLmkOpsNode node is registered successfully.
* @retval LOS_ERRNO_LMK_INVALID_PARAMETER The paramter is invalid. * @retval LOS_ERRNO_LMK_INVALID_PARAMETER The parameter is invalid.
* @retval LOS_ERRNO_LMK_ALREADY_REGISTERED The LosLmkOpsNode node already registered. * @retval LOS_ERRNO_LMK_ALREADY_REGISTERED The LosLmkOpsNode node already registered.
* @par Dependency: * @par Dependency:
* <ul><li>los_lmk.h: the header file that contains the API declaration.</li></ul> * <ul><li>los_lmk.h: the header file that contains the API declaration.</li></ul>

2
components/net/lwip-2.1/porting/src/api_shell.c
View File

@ -488,7 +488,7 @@ LWIP_STATIC int OsPingFunc(u32_t *parg)
PRINTK("\nPing: parameter problem ..."); PRINTK("\nPing: parameter problem ...");
break; break;
default: default:
PRINTK("\nPing: unknow error ..."); PRINTK("\nPing: unknown error ...");
break; break;
} }
i++; i++;

2
components/security/box/los_box.c
View File

@ -50,7 +50,7 @@ VOID OsUserTaskInit(UINT32 taskID, UINTPTR entry, UINTPTR userArea, UINTPTR user
VOID OsUserTaskDelete(UINT32 taskID) VOID OsUserTaskDelete(UINT32 taskID)
{ {
memset_s(&g_UserTaskCBArray[taskID], sizeof(UserTaskCB), 0, sizeof(UserTaskCB)); (VOID)memset_s(&g_UserTaskCBArray[taskID], sizeof(UserTaskCB), 0, sizeof(UserTaskCB));
} }
UserTaskCB *OsGetUserTaskCB(UINT32 taskID) UserTaskCB *OsGetUserTaskCB(UINT32 taskID)

2
components/shell/include/shell.h
View File

@ -115,7 +115,7 @@ typedef enum {
/* /*
* Hook for user-defined debug function * Hook for user-defined debug function
* Unify differnt module's func for registration * Unify different module's func for registration
*/ */
typedef UINT32 (*CmdCallBackFunc)(UINT32 argc, const CHAR **argv); typedef UINT32 (*CmdCallBackFunc)(UINT32 argc, const CHAR **argv);

6
components/shell/src/base/shcmd.c
View File

@ -72,10 +72,10 @@ CmdModInfo *OsCmdInfoGet(VOID)
} }
/* /*
* Description: Pass in the string and clear useless space ,which inlcude: * Description: Pass in the string and clear useless space ,which include:
* 1) The overmatch space which is not be marked by Quote's area * 1) The overmatch space which is not be marked by Quote's area
* Squeeze the overmatch space into one space * Squeeze the overmatch space into one space
* 2) Clear all space before first vaild charatctor * 2) Clear all space before first vaild character
* Input: cmdKey : Pass in the buff string, which is ready to be operated * Input: cmdKey : Pass in the buff string, which is ready to be operated
* cmdOut : Pass out the buffer string ,which has already been operated * cmdOut : Pass out the buffer string ,which has already been operated
* size : cmdKey length * size : cmdKey length
@ -114,7 +114,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsCmdKeyShift(const CHAR *cmdKey, CHAR *cmdOut, UI
/* 1) Quotes matching status is FALSE (which said that the space is not been marked by double quotes) */ /* 1) Quotes matching status is FALSE (which said that the space is not been marked by double quotes) */
/* 2) Current charactor is a space */ /* 2) Current charactor is a space */
/* 3) Next charactor is a space too, or the string is been seeked to the end already(\0) */ /* 3) Next charactor is a space too, or the string is been seeked to the end already(\0) */
/* 4) Invaild charactor, such as single quotes */ /* 4) Invalid charactor, such as single quotes */
if ((*cmdKey == ' ') && ((*(cmdKey + 1) == ' ') || (*(cmdKey + 1) == '\0')) && QUOTES_STATUS_CLOSE(quotes)) { if ((*cmdKey == ' ') && ((*(cmdKey + 1) == ' ') || (*(cmdKey + 1) == '\0')) && QUOTES_STATUS_CLOSE(quotes)) {
continue; continue;
} }

2
components/shell/src/base/shmsg.c
View File

@ -96,7 +96,7 @@ CHAR *GetCmdName(const CHAR *cmdline, UINT32 len)
continue; continue;
} }
/* If detected a space which the quotes matching status is false */ /* If detected a space which the quotes matching status is false */
/* which said has detected the first space for seperator, finish this scan operation */ /* which said has detected the first space for separator, finish this scan operation */
if ((*tmpStr == ' ') && (QUOTES_STATUS_CLOSE(quotes))) { if ((*tmpStr == ' ') && (QUOTES_STATUS_CLOSE(quotes))) {
break; break;
} }

2
components/trace/los_trace.c
View File

@ -106,7 +106,7 @@ STATIC VOID OsTraceSetFrame(TraceEventFrame *frame, UINT32 eventType, UINTPTR id
#if (LOSCFG_TRACE_FRAME_CORE_MSG == 1) #if (LOSCFG_TRACE_FRAME_CORE_MSG == 1)
frame->core.cpuId = ArchCurrCpuid(); frame->core.cpuId = ArchCurrCpuid();
frame->core.hwiActive = OS_INT_ACTIVE ? TRUE : FALSE; frame->core.hwiActive = OS_INT_ACTIVE ? TRUE : FALSE;
frame->core.taskLockCnt = MIN(OsPercpuGet()->taskLockCnt, 0xF); /* taskLockCnt is 4 bits, max vaule = 0xF */ frame->core.taskLockCnt = MIN(OsPercpuGet()->taskLockCnt, 0xF); /* taskLockCnt is 4 bits, max value = 0xF */
frame->core.paramCount = paramCount; frame->core.paramCount = paramCount;
#endif #endif

2
components/trace/los_trace.h
View File

@ -223,7 +223,7 @@ typedef struct {
/** /**
* @ingroup los_trace * @ingroup los_trace
* struct to store the event infomation * struct to store the event information
*/ */
typedef struct { typedef struct {
UINT32 eventType; /**< event type */ UINT32 eventType; /**< event type */

2
components/trace/los_trace_pri.h
View File

@ -96,7 +96,7 @@ typedef struct {
/** /**
* @ingroup los_trace * @ingroup los_trace
* struct to store the event infomation * struct to store the event information
*/ */
typedef struct { typedef struct {
UINT32 cmd; /* trace start or stop cmd */ UINT32 cmd; /* trace start or stop cmd */

2
components/trace/pipeline/trace_pipeline.c
View File

@ -134,7 +134,7 @@ VOID OsTraceDataSend(UINT8 type, UINT16 len, UINT8 *data)
UINT32 intSave; UINT32 intSave;
UINT8 outBuf[LOSCFG_TRACE_TLV_BUF_SIZE] = {0}; UINT8 outBuf[LOSCFG_TRACE_TLV_BUF_SIZE] = {0};
if ((type > TRACE_MSG_MAX) || (len > LOSCFG_TRACE_TLV_BUF_SIZE)) { if ((type >= TRACE_MSG_MAX) || (len > LOSCFG_TRACE_TLV_BUF_SIZE)) {
return; return;
} }

2
components/trace/trace_offline.c
View File

@ -186,7 +186,7 @@ STATIC VOID OsTraceInfoEventData(VOID)
UINT32 taskLockCnt = frame->core.taskLockCnt; UINT32 taskLockCnt = frame->core.taskLockCnt;
#if (LOSCFG_KERNEL_SMP == 1) #if (LOSCFG_KERNEL_SMP == 1)
/* /*
* For smp systems, TRACE_LOCK will requst taskLock, and this counter * For smp systems, TRACE_LOCK will request taskLock, and this counter
* will increase by 1 in that case. * will increase by 1 in that case.
*/ */
taskLockCnt -= 1; taskLockCnt -= 1;

6
kal/libc/newlib/porting/src/other_adapt.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved. * Copyright (c) 2021-2022 Huawei Device Co., Ltd. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, * Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met: * are permitted provided that the following conditions are met:
@ -37,7 +37,7 @@
int _isatty(int file) int _isatty(int file)
{ {
return file <= 2; return (int)(file <= 2); // 2: stderr
} }
int _kill(int i, int j) int _kill(int i, int j)
@ -52,7 +52,7 @@ int _getpid(void)
void _exit(int status) void _exit(int status)
{ {
write(1, "exit\n", 5); write(1, "exit\n", 5); // 1: stdout; 5: string length
(VOID)pthread_exit(&status); (VOID)pthread_exit(&status);
while (1) { while (1) {
} }

10
kernel/include/los_memory.h
View File

@ -103,11 +103,11 @@ extern UINT32 LOS_MemDeInit(VOID *pool);
/** /**
* @ingroup los_memory * @ingroup los_memory
* @brief Print infomation about all pools. * @brief Print information about all pools.
* *
* @par Description: * @par Description:
* <ul> * <ul>
* <li>This API is used to print infomation about all pools.</li> * <li>This API is used to print information about all pools.</li>
* </ul> * </ul>
* *
* @retval #UINT32 The pool number. * @retval #UINT32 The pool number.
@ -394,11 +394,11 @@ extern UINT32 LOS_MemTotalUsedGet(VOID *pool);
/** /**
* @ingroup los_memory * @ingroup los_memory
* @brief Get the infomation of memory pool. * @brief Get the information of memory pool.
* *
* @par Description: * @par Description:
* <ul> * <ul>
* <li>This API is used to get the infomation of memory pool.</li> * <li>This API is used to get the information of memory pool.</li>
* </ul> * </ul>
* @attention * @attention
* <ul> * <ul>
@ -409,7 +409,7 @@ extern UINT32 LOS_MemTotalUsedGet(VOID *pool);
* @param poolStatus [IN] A pointer for storage the pool status * @param poolStatus [IN] A pointer for storage the pool status
* *
* @retval #LOS_NOK The incoming parameter pool is NULL or invalid. * @retval #LOS_NOK The incoming parameter pool is NULL or invalid.
* @retval #LOS_OK Success to get memory infomation. * @retval #LOS_OK Success to get memory information.
* @par Dependency: * @par Dependency:
* <ul><li>los_memory.h: the header file that contains the API declaration.</li></ul> * <ul><li>los_memory.h: the header file that contains the API declaration.</li></ul>
* @see None. * @see None.

4
kernel/include/los_queue.h
View File

@ -323,7 +323,7 @@ extern "C" {
/** /**
* @ingroup los_queue * @ingroup los_queue
* Queue error code: The buffer size passed in during queue readding is smaller than the queue size. * Queue error code: The buffer size passed in during queue reading is smaller than the queue size.
* *
* Value: 0x0200061f * Value: 0x0200061f
* *
@ -333,7 +333,7 @@ extern "C" {
/** /**
* @ingroup los_queue * @ingroup los_queue
* Queue error code: The buffer size passed in during queue readding or writting is bigger than the biggest size. * Queue error code: The buffer size passed in during queue reading or writing is bigger than the biggest size.
* *
* Value: 0x02000620 * Value: 0x02000620
* *

2
kernel/include/los_swtmr.h
View File

@ -342,7 +342,7 @@ extern UINT32 LOS_SwtmrStop(UINT32 swtmrID);
* specified by usSwTmrID. * specified by usSwTmrID.
* @attention * @attention
* <ul> * <ul>
* <li>The specific timer should be created and started successfully, error happends otherwise.</li> * <li>The specific timer should be created and started successfully, error happens otherwise.</li>
* </ul> * </ul>
* *
* @param swtmrID [IN] Software timer ID created by LOS_SwtmrCreate. * @param swtmrID [IN] Software timer ID created by LOS_SwtmrCreate.

3
kernel/src/los_queue.c
View File

@ -120,6 +120,9 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_QueueCreate(const CHAR *queueName,
/* Memory allocation is time-consuming, to shorten the time of disable interrupt, /* Memory allocation is time-consuming, to shorten the time of disable interrupt,
move the memory allocation to here. */ move the memory allocation to here. */
if ((UINT32_MAX / msgSize) < len) {
return LOS_ERRNO_QUEUE_SIZE_TOO_BIG;
}
queue = (UINT8 *)LOS_MemAlloc(m_aucSysMem0, (UINT32)len * msgSize); queue = (UINT8 *)LOS_MemAlloc(m_aucSysMem0, (UINT32)len * msgSize);
if (queue == NULL) { if (queue == NULL) {
return LOS_ERRNO_QUEUE_CREATE_NO_MEMORY; return LOS_ERRNO_QUEUE_CREATE_NO_MEMORY;

2
targets/riscv_nuclei_demo_soc_gcc/SoC/demosoc/Common/Include/demosoc_i2c.h
View File

@ -32,7 +32,7 @@ extern "C" {
#define I2C_SR_RXACK (1 << 7)//0:received; 1:no ack resceived #define I2C_SR_RXACK (1 << 7)//0:received; 1:no ack resceived
#define I2C_SR_BUSY (1 << 6)//0:after 'STOP' detected; 1:after 'START' detected #define I2C_SR_BUSY (1 << 6)//0:after 'STOP' detected; 1:after 'START' detected
#define I2C_SR_AL (1 << 5) #define I2C_SR_AL (1 << 5)
#define I2C_SR_TIP (1 << 1)//0:transfer complete; 1:transfering #define I2C_SR_TIP (1 << 1)//0:transfer complete; 1:transferring
#define I2C_SR_IF (1 << 0) #define I2C_SR_IF (1 << 0)
#if 0 #if 0
/*fileds*/ /*fileds*/

2
targets/riscv_nuclei_demo_soc_gcc/SoC/demosoc/Common/Source/system_demosoc.c
View File

@ -280,7 +280,7 @@ void ECLIC_Init(void)
* \param [in] IRQn NMI interrupt handler address * \param [in] IRQn NMI interrupt handler address
* \param [in] shv \ref ECLIC_NON_VECTOR_INTERRUPT means non-vector mode, and \ref ECLIC_VECTOR_INTERRUPT is vector mode * \param [in] shv \ref ECLIC_NON_VECTOR_INTERRUPT means non-vector mode, and \ref ECLIC_VECTOR_INTERRUPT is vector mode
* \param [in] trig_mode see \ref ECLIC_TRIGGER_Type * \param [in] trig_mode see \ref ECLIC_TRIGGER_Type
* \param [in] lvl interupt level * \param [in] lvl interrupt level
* \param [in] priority interrupt priority * \param [in] priority interrupt priority
* \param [in] handler interrupt handler, if NULL, handler will not be installed * \param [in] handler interrupt handler, if NULL, handler will not be installed
* \return -1 means invalid input parameter. 0 means successful. * \return -1 means invalid input parameter. 0 means successful.

2
targets/riscv_nuclei_gd32vf103_soc_gcc/SoC/gd32vf103/Common/Source/Drivers/gd32vf103_spi.c
View File

@ -98,7 +98,7 @@ void spi_struct_para_init(spi_parameter_struct* spi_struct)
/*! /*!
\brief initialize SPI parameter \brief initialize SPI parameter
\param[in] spi_periph: SPIx(x=0,1,2) \param[in] spi_periph: SPIx(x=0,1,2)
\param[in] spi_struct: SPI parameter initialization stuct members of the structure \param[in] spi_struct: SPI parameter initialization struct members of the structure
and the member values are shown as below: and the member values are shown as below:
device_mode: SPI_MASTER, SPI_SLAVE device_mode: SPI_MASTER, SPI_SLAVE
trans_mode: SPI_TRANSMODE_FULLDUPLEX, SPI_TRANSMODE_RECEIVEONLY, trans_mode: SPI_TRANSMODE_FULLDUPLEX, SPI_TRANSMODE_RECEIVEONLY,

6
targets/riscv_nuclei_gd32vf103_soc_gcc/SoC/gd32vf103/Common/Source/system_gd32vf103.c
View File

@ -423,9 +423,9 @@ uint32_t core_exception_handler(unsigned long mcause, unsigned long sp)
uint32_t EXCn = (uint32_t)(mcause & 0X00000fff); uint32_t EXCn = (uint32_t)(mcause & 0X00000fff);
EXC_HANDLER exc_handler; EXC_HANDLER exc_handler;
PRINTK("----------------All Task infomation ------------\r\n"); PRINTK("----------------All Task information ------------\r\n");
HalDisplayTaskInfo(); HalDisplayTaskInfo();
PRINTK("---------------exc handler infomation -----------\r\n"); PRINTK("---------------exc handler information -----------\r\n");
if ((EXCn < MAX_SYSTEM_EXCEPTION_NUM) && (EXCn >= 0)) { if ((EXCn < MAX_SYSTEM_EXCEPTION_NUM) && (EXCn >= 0)) {
exc_handler = (EXC_HANDLER)SystemExceptionHandlers[EXCn]; exc_handler = (EXC_HANDLER)SystemExceptionHandlers[EXCn];
@ -474,7 +474,7 @@ void ECLIC_Init(void)
* \param [in] IRQn NMI interrupt handler address * \param [in] IRQn NMI interrupt handler address
* \param [in] shv \ref ECLIC_NON_VECTOR_INTERRUPT means non-vector mode, and \ref ECLIC_VECTOR_INTERRUPT is vector mode * \param [in] shv \ref ECLIC_NON_VECTOR_INTERRUPT means non-vector mode, and \ref ECLIC_VECTOR_INTERRUPT is vector mode
* \param [in] trig_mode see \ref ECLIC_TRIGGER_Type * \param [in] trig_mode see \ref ECLIC_TRIGGER_Type
* \param [in] lvl interupt level * \param [in] lvl interrupt level
* \param [in] priority interrupt priority * \param [in] priority interrupt priority
* \param [in] handler interrupt handler, if NULL, handler will not be installed * \param [in] handler interrupt handler, if NULL, handler will not be installed
* \return -1 means invalid input parameter. 0 means successful. * \return -1 means invalid input parameter. 0 means successful.

2
testsuites/include/osTest.h
View File

@ -297,7 +297,7 @@ extern UINT32 TaskUsedCountGet(VOID);
#define HWI_NUM_TEST3 36 #define HWI_NUM_TEST3 36
#define LOS_KERNEL_MULTI_HWI_TEST 1 // default enable multiple hwi number test case #define LOS_KERNEL_MULTI_HWI_TEST 1 // default enable multiple hwi number test case
#elif __CSKY_V2__ #elif __CSKY_V2__
#define HWI_NUM_TEST 31 // csky_v2 only suppport one software interrupt number #define HWI_NUM_TEST 31 // csky_v2 only support one software interrupt number
#define LOS_KERNEL_MULTI_HWI_TEST 0 // csky_v2 not support multiple hwi number test case #define LOS_KERNEL_MULTI_HWI_TEST 0 // csky_v2 not support multiple hwi number test case
#elif __XTENSA_LX6__ #elif __XTENSA_LX6__
#define HWI_NUM_TEST 7 // xtensa_lx6 only suppport one software interrupt number #define HWI_NUM_TEST 7 // xtensa_lx6 only suppport one software interrupt number

2
testsuites/sample/kernel/dynlink/It_los_dynlink_002.c
View File

@ -30,7 +30,7 @@
#include "los_dynlink.h" #include "los_dynlink.h"
#include "It_los_dynlink.h" #include "It_los_dynlink.h"
/* Test invalide params */ /* Test invalid params */
STATIC UINT32 TestCase(VOID) STATIC UINT32 TestCase(VOID)
{ {
VOID *handle = NULL; VOID *handle = NULL;

2
utils/los_debug.h
View File

@ -121,7 +121,7 @@ typedef enum {
* *
* @param type [IN] Type LogModuleType indicates the log type. * @param type [IN] Type LogModuleType indicates the log type.
* @param level [IN] Type LogLevel indicates the log level. * @param level [IN] Type LogLevel indicates the log level.
* @param fmt [IN] Type char* controls the ouput as in C printf. * @param fmt [IN] Type char* controls the output as in C printf.
* *
* @retval None * @retval None
* @par Dependency: * @par Dependency: