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

!337 fix: 删除C文件中无用的__cplusplus 

Merge pull request !337 from kenneth/cplusplus
This commit is contained in:
openharmony_ci 2021-10-09 09:06:00 +00:00 committed by Gitee
parent 9dbcb43b51 7fe3aaddf5
commit adaefc6133
55 changed files with 111 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/arch/arm/arm9/gcc/los_arch_interrupt.h
View File

@ -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

6
kernel/arch/arm/cortex-m3/keil/los_arch_atomic.h
View File

@ -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.

7
kernel/arch/arm/cortex-m3/keil/los_arch_interrupt.h
View File

@ -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 {

2
kernel/arch/arm/cortex-m3/keil/los_context.c
View File

@ -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
**************************************************************************** */

6
kernel/arch/arm/cortex-m3/keil/los_interrupt.c
View File

@ -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;

6
kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_atomic.h
View File

@ -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.

7
kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_interrupt.h
View File

@ -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 {

2
kernel/arch/arm/cortex-m33/gcc/NTZ/los_context.c
View File

@ -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
**************************************************************************** */

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

@ -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}

6
kernel/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c
View File

@ -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;

6
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_atomic.h
View File

@ -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.

2
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_context.h
View File

@ -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)))

7
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_interrupt.h
View File

@ -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 {

4
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_context.c
View File

@ -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;

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

@ -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}

6
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c
View File

@ -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;

6
kernel/arch/arm/cortex-m33/gcc/los_arch_atomic.h
View File

@ -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.

7
kernel/arch/arm/cortex-m33/gcc/los_arch_interrupt.h
View File

@ -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 {

2
kernel/arch/arm/cortex-m33/gcc/los_context.c
View File

@ -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
**************************************************************************** */

2
kernel/arch/arm/cortex-m33/gcc/los_dispatch.S
View File

@ -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)))

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

@ -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}

6
kernel/arch/arm/cortex-m33/gcc/los_interrupt.c
View File

@ -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;

2
kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_atomic.h
View File

@ -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>

2
kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_interrupt.h
View File

@ -546,7 +546,7 @@ VOID HalExcMemFault(VOID);
VOID HalExcBusFault(VOID);
VOID HalExcUsageFault(VOID);
VOID HalSVCHandler(VOID);
VOID HalHwiInit();
VOID HalHwiInit(VOID);
/**

2
kernel/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c
View File

@ -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;

2
kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_atomic.h
View File

@ -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>

2
kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_interrupt.h
View File

@ -546,7 +546,7 @@ VOID HalExcMemFault(VOID);
VOID HalExcBusFault(VOID);
VOID HalExcUsageFault(VOID);
VOID HalSVCHandler(VOID);
VOID HalHwiInit();
VOID HalHwiInit(VOID);
/**

2
kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c
View File

@ -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;

6
kernel/arch/arm/cortex-m4/gcc/los_arch_atomic.h
View File

@ -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.

5
kernel/arch/arm/cortex-m4/gcc/los_arch_interrupt.h
View File

@ -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);
/**

2
kernel/arch/arm/cortex-m4/gcc/los_context.c
View File

@ -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
**************************************************************************** */

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

@ -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

6
kernel/arch/arm/cortex-m4/gcc/los_interrupt.c
View File

@ -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;

6
kernel/arch/arm/cortex-m4/iar/los_arch_atomic.h
View File

@ -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.

5
kernel/arch/arm/cortex-m4/iar/los_arch_interrupt.h
View File

@ -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);
/**

2
kernel/arch/arm/cortex-m4/iar/los_context.c
View File

@ -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
**************************************************************************** */

6
kernel/arch/arm/cortex-m4/iar/los_interrupt.c
View File

@ -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;

6
kernel/arch/arm/cortex-m7/gcc/los_arch_atomic.h
View File

@ -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.

7
kernel/arch/arm/cortex-m7/gcc/los_arch_interrupt.h
View File

@ -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 {

2
kernel/arch/arm/cortex-m7/gcc/los_context.c
View File

@ -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
**************************************************************************** */

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

@ -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}

6
kernel/arch/arm/cortex-m7/gcc/los_interrupt.c
View File

@ -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;

6
kernel/arch/arm/cortex-m7/iar/los_arch_atomic.h
View File

@ -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.

7
kernel/arch/arm/cortex-m7/iar/los_arch_interrupt.h
View File

@ -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 {

2
kernel/arch/arm/cortex-m7/iar/los_context.c
View File

@ -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
**************************************************************************** */

4
kernel/arch/arm/cortex-m7/iar/los_interrupt.c
View File

@ -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 }};

3
kernel/arch/csky/v2/gcc/los_arch_atomic.h
View File

@ -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.
*

11
kernel/arch/csky/v2/gcc/los_interrupt.c
View File

@ -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 */

12
kernel/arch/csky/v2/gcc/los_timer.c
View File

@ -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 */

2
kernel/arch/risc-v/nuclei/gcc/los_arch_context.h
View File

@ -90,4 +90,4 @@ extern VOID HalStartToRun(VOID);
#endif /* __cplusplus */
#endif /* __cplusplus */
#endif /* _LOS_HW_H */
#endif /* _LOS_ARCH_CONTEXT_H */

11
kernel/arch/risc-v/nuclei/gcc/los_context.c
View File

@ -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 */

11
kernel/arch/risc-v/nuclei/gcc/los_interrupt.c
View File

@ -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 */

11
kernel/arch/risc-v/nuclei/gcc/los_timer.c
View File

@ -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 */

3
kernel/arch/xtensa/lx6/gcc/los_arch_atomic.h
View File

@ -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.
*

4
kernel/arch/xtensa/lx6/gcc/los_interrupt.c
View File

@ -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};