!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
commit adaefc6133
55 changed files with 111 additions and 173 deletions

View File

@ -282,7 +282,7 @@ typedef struct TagExcContext {
typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *); typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr); VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
VOID HalHwiInit(); VOID HalHwiInit(VOID);
/** /**
* @ingroup los_exc * @ingroup los_exc

View File

@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @brief Atomic auto-decrement. * @brief Atomic auto-decrement.
* *
* @par Description: * @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 * @attention
* <ul> * <ul>
* <li>The pointer v must not be NULL.</li> * <li>The pointer v must not be NULL.</li>

View File

@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
* *
* @retval:None. * @retval:None.
* @par Dependency: * @par Dependency:
* <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
></ul>
* @see None. * @see None.
*/ */
extern VOID HalHwiDefaultHandler(VOID); extern VOID HalHwiDefaultHandler(VOID);
@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
VOID HalExcBusFault(VOID); VOID HalExcBusFault(VOID);
VOID HalExcUsageFault(VOID); VOID HalExcUsageFault(VOID);
VOID HalExcSvcCall(VOID); VOID HalExcSvcCall(VOID);
VOID HalHwiInit(); VOID HalHwiInit(VOID);
/** /**
@ -681,7 +680,7 @@ VOID HalHwiInit();
* @ingroup los_exc * @ingroup los_exc
* Exception information structure * 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 { typedef struct TagExcInfo {

View File

@ -52,7 +52,7 @@ LITE_OS_SEC_VEC
#endif #endif
/* * /* *
* @ingroup los_hwi * @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}; STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
@ -65,7 +65,7 @@ typedef struct {
/* * /* *
* @ingroup los_hwi * @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 }}; 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 Output : None
Return : 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) #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
UINT32 index; UINT32 index;

View File

@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @brief Atomic auto-decrement. * @brief Atomic auto-decrement.
* *
* @par Description: * @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 * @attention
* <ul> * <ul>
* <li>The pointer v must not be NULL.</li> * <li>The pointer v must not be NULL.</li>

View File

@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
* *
* @retval:None. * @retval:None.
* @par Dependency: * @par Dependency:
* <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
></ul>
* @see None. * @see None.
*/ */
extern VOID HalHwiDefaultHandler(VOID); extern VOID HalHwiDefaultHandler(VOID);
@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
VOID HalExcBusFault(VOID); VOID HalExcBusFault(VOID);
VOID HalExcUsageFault(VOID); VOID HalExcUsageFault(VOID);
VOID HalSVCHandler(VOID); VOID HalSVCHandler(VOID);
VOID HalHwiInit(); VOID HalHwiInit(VOID);
/** /**
@ -681,7 +680,7 @@ VOID HalHwiInit();
* @ingroup los_exc * @ingroup los_exc
* Exception information structure * 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 { typedef struct TagExcInfo {

View File

@ -47,7 +47,7 @@ UINT32 g_intCount = 0;
/* * /* *
* @ingroup los_hwi * @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}; STATIC HWI_PROC_FUNC __attribute__((aligned(0x100))) g_hwiForm[OS_VECTOR_CNT] = {0};
@ -60,7 +60,7 @@ typedef struct {
/* * /* *
* @ingroup los_hwi * @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 }}; 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 Output : None
Return : 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) #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
UINT32 index; UINT32 index;

View File

@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @brief Atomic auto-decrement. * @brief Atomic auto-decrement.
* *
* @par Description: * @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 * @attention
* <ul> * <ul>
* <li>The pointer v must not be NULL.</li> * <li>The pointer v must not be NULL.</li>

View File

@ -43,7 +43,7 @@ extern "C" {
typedef struct TagTskContext { typedef struct TagTskContext {
UINT32 secureContext; UINT32 secureContext;
UINT32 stackLmit; UINT32 stackLimit;
UINT32 excReturn; UINT32 excReturn;
#if ((defined(__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \ #if ((defined(__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
(defined(__FPU_USED) && (__FPU_USED == 1U))) (defined(__FPU_USED) && (__FPU_USED == 1U)))

View File

@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
* *
* @retval:None. * @retval:None.
* @par Dependency: * @par Dependency:
* <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
></ul>
* @see None. * @see None.
*/ */
extern VOID HalHwiDefaultHandler(VOID); extern VOID HalHwiDefaultHandler(VOID);
@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
VOID HalExcBusFault(VOID); VOID HalExcBusFault(VOID);
VOID HalExcUsageFault(VOID); VOID HalExcUsageFault(VOID);
VOID HalSVCHandler(VOID); VOID HalSVCHandler(VOID);
VOID HalHwiInit(); VOID HalHwiInit(VOID);
/** /**
@ -681,7 +680,7 @@ VOID HalHwiInit();
* @ingroup los_exc * @ingroup los_exc
* Exception information structure * 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 { typedef struct TagExcInfo {

View File

@ -133,7 +133,7 @@ LITE_OS_SEC_TEXT_INIT VOID *HalTskStackInit(UINT32 taskID, UINT32 stackSize, VOI
#endif #endif
context->secureContext = 0UL; context->secureContext = 0UL;
context->stackLmit = (UINT32)topStack; context->stackLimit = (UINT32)topStack;
context->excReturn = 0xFFFFFFBC; context->excReturn = 0xFFFFFFBC;
context->uwR4 = 0x04040404L; context->uwR4 = 0x04040404L;

View File

@ -47,7 +47,7 @@ UINT32 g_intCount = 0;
/* * /* *
* @ingroup los_hwi * @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}; STATIC HWI_PROC_FUNC __attribute__((aligned(0x100))) g_hwiForm[OS_VECTOR_CNT] = {0};
@ -60,7 +60,7 @@ typedef struct {
/* * /* *
* @ingroup los_hwi * @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 }}; 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 Output : None
Return : 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) #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
UINT32 index; UINT32 index;

View File

@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @brief Atomic auto-decrement. * @brief Atomic auto-decrement.
* *
* @par Description: * @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 * @attention
* <ul> * <ul>
* <li>The pointer v must not be NULL.</li> * <li>The pointer v must not be NULL.</li>

View File

@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
* *
* @retval:None. * @retval:None.
* @par Dependency: * @par Dependency:
* <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
></ul>
* @see None. * @see None.
*/ */
extern VOID HalHwiDefaultHandler(VOID); extern VOID HalHwiDefaultHandler(VOID);
@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
VOID HalExcBusFault(VOID); VOID HalExcBusFault(VOID);
VOID HalExcUsageFault(VOID); VOID HalExcUsageFault(VOID);
VOID HalExcSvcCall(VOID); VOID HalExcSvcCall(VOID);
VOID HalHwiInit(); VOID HalHwiInit(VOID);
/** /**
@ -681,7 +680,7 @@ VOID HalHwiInit();
* @ingroup los_exc * @ingroup los_exc
* Exception information structure * 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 { typedef struct TagExcInfo {

View File

@ -47,7 +47,7 @@ UINT32 g_intCount = 0;
/* * /* *
* @ingroup los_hwi * @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}; STATIC HWI_PROC_FUNC __attribute__((aligned(0x100))) g_hwiForm[OS_VECTOR_CNT] = {0};
@ -60,7 +60,7 @@ typedef struct {
/* * /* *
* @ingroup los_hwi * @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 }}; 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 Output : None
Return : 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) #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
UINT32 index; UINT32 index;

View File

@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @brief Atomic auto-decrement. * @brief Atomic auto-decrement.
* *
* @par Description: * @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 * @attention
* <ul> * <ul>
* <li>The pointer v must not be NULL.</li> * <li>The pointer v must not be NULL.</li>

View File

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

View File

@ -491,7 +491,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
Output : None Output : None
Return : 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) #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
UINT32 index; UINT32 index;

View File

@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @brief Atomic auto-decrement. * @brief Atomic auto-decrement.
* *
* @par Description: * @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 * @attention
* <ul> * <ul>
* <li>The pointer v must not be NULL.</li> * <li>The pointer v must not be NULL.</li>

View File

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

View File

@ -491,7 +491,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
Output : None Output : None
Return : 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) #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
UINT32 index; UINT32 index;

View File

@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @brief Atomic auto-decrement. * @brief Atomic auto-decrement.
* *
* @par Description: * @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 * @attention
* <ul> * <ul>
* <li>The pointer v must not be NULL.</li> * <li>The pointer v must not be NULL.</li>

View File

@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
* *
* @retval:None. * @retval:None.
* @par Dependency: * @par Dependency:
* <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
></ul>
* @see None. * @see None.
*/ */
extern VOID HalHwiDefaultHandler(VOID); extern VOID HalHwiDefaultHandler(VOID);
@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
VOID HalExcBusFault(VOID); VOID HalExcBusFault(VOID);
VOID HalExcUsageFault(VOID); VOID HalExcUsageFault(VOID);
VOID HalExcSvcCall(VOID); VOID HalExcSvcCall(VOID);
VOID HalHwiInit(); VOID HalHwiInit(VOID);
/** /**

View File

@ -52,7 +52,7 @@ LITE_OS_SEC_VEC
#endif #endif
/* * /* *
* @ingroup los_hwi * @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}; STATIC HWI_PROC_FUNC __attribute__((aligned(0x100))) g_hwiForm[OS_VECTOR_CNT] = {0};
@ -65,7 +65,7 @@ typedef struct {
/* * /* *
* @ingroup los_hwi * @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 }}; 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 Output : None
Return : 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) #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
UINT32 index; UINT32 index;

View File

@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @brief Atomic auto-decrement. * @brief Atomic auto-decrement.
* *
* @par Description: * @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 * @attention
* <ul> * <ul>
* <li>The pointer v must not be NULL.</li> * <li>The pointer v must not be NULL.</li>

View File

@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
* *
* @retval:None. * @retval:None.
* @par Dependency: * @par Dependency:
* <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
></ul>
* @see None. * @see None.
*/ */
extern VOID HalHwiDefaultHandler(VOID); extern VOID HalHwiDefaultHandler(VOID);
@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
VOID HalExcBusFault(VOID); VOID HalExcBusFault(VOID);
VOID HalExcUsageFault(VOID); VOID HalExcUsageFault(VOID);
VOID HalExcSvcCall(VOID); VOID HalExcSvcCall(VOID);
VOID HalHwiInit(); VOID HalHwiInit(VOID);
/** /**

View File

@ -53,7 +53,7 @@ LITE_OS_SEC_VEC
#endif #endif
/* * /* *
* @ingroup los_hwi * @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}; STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
@ -66,7 +66,7 @@ typedef struct {
/* * /* *
* @ingroup los_hwi * @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 }}; 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 Output : None
Return : 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) #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
UINT32 index; UINT32 index;

View File

@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @brief Atomic auto-decrement. * @brief Atomic auto-decrement.
* *
* @par Description: * @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 * @attention
* <ul> * <ul>
* <li>The pointer v must not be NULL.</li> * <li>The pointer v must not be NULL.</li>

View File

@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
* *
* @retval:None. * @retval:None.
* @par Dependency: * @par Dependency:
* <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
></ul>
* @see None. * @see None.
*/ */
extern VOID HalHwiDefaultHandler(VOID); extern VOID HalHwiDefaultHandler(VOID);
@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
VOID HalExcBusFault(VOID); VOID HalExcBusFault(VOID);
VOID HalExcUsageFault(VOID); VOID HalExcUsageFault(VOID);
VOID HalExcSvcCall(VOID); VOID HalExcSvcCall(VOID);
VOID HalHwiInit(); VOID HalHwiInit(VOID);
/** /**
@ -681,7 +680,7 @@ VOID HalHwiInit();
* @ingroup los_exc * @ingroup los_exc
* Exception information structure * 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 { typedef struct TagExcInfo {

View File

@ -47,7 +47,7 @@ UINT32 g_intCount = 0;
/* * /* *
* @ingroup los_hwi * @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}; STATIC HWI_PROC_FUNC __attribute__((aligned(0x100))) g_hwiForm[OS_VECTOR_CNT] = {0};
@ -60,7 +60,7 @@ typedef struct {
/* * /* *
* @ingroup los_hwi * @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 }}; 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 Output : None
Return : 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) #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
UINT32 index; UINT32 index;

View File

@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @brief Atomic auto-decrement. * @brief Atomic auto-decrement.
* *
* @par Description: * @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 * @attention
* <ul> * <ul>
* <li>The pointer v must not be NULL.</li> * <li>The pointer v must not be NULL.</li>

View File

@ -375,8 +375,7 @@ extern UINT32 HalIntNumGet(VOID);
* *
* @retval:None. * @retval:None.
* @par Dependency: * @par Dependency:
* <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
></ul>
* @see None. * @see None.
*/ */
extern VOID HalHwiDefaultHandler(VOID); extern VOID HalHwiDefaultHandler(VOID);
@ -546,7 +545,7 @@ VOID HalExcMemFault(VOID);
VOID HalExcBusFault(VOID); VOID HalExcBusFault(VOID);
VOID HalExcUsageFault(VOID); VOID HalExcUsageFault(VOID);
VOID HalExcSvcCall(VOID); VOID HalExcSvcCall(VOID);
VOID HalHwiInit(); VOID HalHwiInit(VOID);
/** /**
@ -681,7 +680,7 @@ VOID HalHwiInit();
* @ingroup los_exc * @ingroup los_exc
* Exception information structure * 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 { typedef struct TagExcInfo {

View File

@ -49,7 +49,7 @@ UINT32 g_intCount = 0;
#pragma data_alignment=0x100 #pragma data_alignment=0x100
/* * /* *
* @ingroup los_hwi * @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}; STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
@ -62,7 +62,7 @@ typedef struct {
/* * /* *
* @ingroup los_hwi * @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 }}; STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};

View File

@ -79,7 +79,8 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @attention * @attention
* <ul> * <ul>
* <li>The pointer v must not be NULL.</li> * <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. * @param v [IN] The addSelf variable pointer.
* *

View File

@ -42,12 +42,6 @@
#include "los_memory.h" #include "los_memory.h"
#include "los_membox.h" #include "los_membox.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#define INT_OFFSET 6 #define INT_OFFSET 6
#define PRI_OFF_PER_INT 8 #define PRI_OFF_PER_INT 8
#define PRI_PER_REG 4 #define PRI_PER_REG 4
@ -583,8 +577,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
return; return;
} }
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -37,12 +37,6 @@
#include "los_sched.h" #include "los_sched.h"
#include "los_debug.h" #include "los_debug.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
typedef struct { typedef struct {
UINT32 CTRL; UINT32 CTRL;
UINT32 LOAD; UINT32 LOAD;
@ -138,9 +132,3 @@ UINT32 HalEnterSleep(VOID)
Wfi(); Wfi();
return LOS_OK; return LOS_OK;
} }
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

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

View File

@ -32,12 +32,6 @@ extern VOID HalHwiInit(VOID);
#define INITIAL_MSTATUS ( MSTATUS_MPP | MSTATUS_MPIE | MSTATUS_FS_INITIAL) #define INITIAL_MSTATUS ( MSTATUS_MPP | MSTATUS_MPIE | MSTATUS_FS_INITIAL)
#define ALIGN_DOWN(size, align) ((size) & ~((align) - 1)) #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) LITE_OS_SEC_TEXT_INIT VOID HalArchInit(VOID)
{ {
UINT32 ret; UINT32 ret;
@ -105,8 +99,3 @@ VOID HalTaskSwitch(VOID)
g_losTask.runTask = g_losTask.newTask; g_losTask.runTask = g_losTask.newTask;
} }
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -37,12 +37,6 @@
#include "los_debug.h" #include "los_debug.h"
#include "nuclei_sdk_hal.h" #include "nuclei_sdk_hal.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
UINT32 g_intCount = 0; UINT32 g_intCount = 0;
// LosExcInfo g_excInfo; // LosExcInfo g_excInfo;
@ -188,8 +182,3 @@ __attribute__((always_inline)) inline UINT32 HalIsIntActive(VOID)
return (g_intCount > 0); return (g_intCount > 0);
} }
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -39,12 +39,6 @@
#include "los_arch_timer.h" #include "los_arch_timer.h"
#include "nuclei_sdk_hal.h" #include "nuclei_sdk_hal.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#define configKERNEL_INTERRUPT_PRIORITY 0 #define configKERNEL_INTERRUPT_PRIORITY 0
#define SYSTICK_TICK_CONST (SOC_TIMER_FREQ / LOSCFG_BASE_CORE_TICK_PER_SECOND) #define SYSTICK_TICK_CONST (SOC_TIMER_FREQ / LOSCFG_BASE_CORE_TICK_PER_SECOND)
@ -116,8 +110,3 @@ UINT32 HalEnterSleep(VOID)
return LOS_OK; return LOS_OK;
} }
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */

View File

@ -79,7 +79,8 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @attention * @attention
* <ul> * <ul>
* <li>The pointer v must not be NULL.</li> * <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. * @param v [IN] The addSelf variable pointer.
* *

View File

@ -59,7 +59,7 @@ typedef struct {
/* * /* *
* @ingroup los_hwi * @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 }}; 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 #else
/* * /* *
* @ingroup los_hwi * @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}; STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};