Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Kernel Liteos M
提交
adaefc61
K
Kernel Liteos M
项目概览
OpenHarmony
/
Kernel Liteos M
大约 1 年 前同步成功
通知
20
Star
28
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel Liteos M
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
adaefc61
编写于
10月 09, 2021
作者:
O
openharmony_ci
提交者:
Gitee
10月 09, 2021
浏览文件
操作
浏览文件
下载
差异文件
!337 fix: 删除C文件中无用的__cplusplus
Merge pull request !337 from kenneth/cplusplus
上级
9dbcb43b
7fe3aadd
变更
55
隐藏空白更改
内联
并排
Showing
55 changed file
with
111 addition
and
173 deletion
+111
-173
kernel/arch/arm/arm9/gcc/los_arch_interrupt.h
kernel/arch/arm/arm9/gcc/los_arch_interrupt.h
+1
-1
kernel/arch/arm/cortex-m3/keil/los_arch_atomic.h
kernel/arch/arm/cortex-m3/keil/los_arch_atomic.h
+3
-3
kernel/arch/arm/cortex-m3/keil/los_arch_interrupt.h
kernel/arch/arm/cortex-m3/keil/los_arch_interrupt.h
+3
-4
kernel/arch/arm/cortex-m3/keil/los_context.c
kernel/arch/arm/cortex-m3/keil/los_context.c
+1
-1
kernel/arch/arm/cortex-m3/keil/los_interrupt.c
kernel/arch/arm/cortex-m3/keil/los_interrupt.c
+3
-3
kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_atomic.h
kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_atomic.h
+3
-3
kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_interrupt.h
kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_interrupt.h
+3
-4
kernel/arch/arm/cortex-m33/gcc/NTZ/los_context.c
kernel/arch/arm/cortex-m33/gcc/NTZ/los_context.c
+1
-1
kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S
kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S
+4
-4
kernel/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c
kernel/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c
+3
-3
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_atomic.h
...l/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_atomic.h
+3
-3
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_context.h
.../arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_context.h
+1
-1
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_interrupt.h
...rch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_interrupt.h
+3
-4
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_context.c
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_context.c
+2
-2
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S
+4
-4
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c
+3
-3
kernel/arch/arm/cortex-m33/gcc/los_arch_atomic.h
kernel/arch/arm/cortex-m33/gcc/los_arch_atomic.h
+3
-3
kernel/arch/arm/cortex-m33/gcc/los_arch_interrupt.h
kernel/arch/arm/cortex-m33/gcc/los_arch_interrupt.h
+3
-4
kernel/arch/arm/cortex-m33/gcc/los_context.c
kernel/arch/arm/cortex-m33/gcc/los_context.c
+1
-1
kernel/arch/arm/cortex-m33/gcc/los_dispatch.S
kernel/arch/arm/cortex-m33/gcc/los_dispatch.S
+1
-1
kernel/arch/arm/cortex-m33/gcc/los_exc.S
kernel/arch/arm/cortex-m33/gcc/los_exc.S
+4
-4
kernel/arch/arm/cortex-m33/gcc/los_interrupt.c
kernel/arch/arm/cortex-m33/gcc/los_interrupt.c
+3
-3
kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_atomic.h
kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_atomic.h
+1
-1
kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_interrupt.h
kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_interrupt.h
+1
-1
kernel/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c
kernel/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c
+1
-1
kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_atomic.h
...l/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_atomic.h
+1
-1
kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_interrupt.h
...rch/arm/cortex-m33/iar/TZ/non_secure/los_arch_interrupt.h
+1
-1
kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c
kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c
+1
-1
kernel/arch/arm/cortex-m4/gcc/los_arch_atomic.h
kernel/arch/arm/cortex-m4/gcc/los_arch_atomic.h
+3
-3
kernel/arch/arm/cortex-m4/gcc/los_arch_interrupt.h
kernel/arch/arm/cortex-m4/gcc/los_arch_interrupt.h
+2
-3
kernel/arch/arm/cortex-m4/gcc/los_context.c
kernel/arch/arm/cortex-m4/gcc/los_context.c
+1
-1
kernel/arch/arm/cortex-m4/gcc/los_exc.S
kernel/arch/arm/cortex-m4/gcc/los_exc.S
+1
-1
kernel/arch/arm/cortex-m4/gcc/los_interrupt.c
kernel/arch/arm/cortex-m4/gcc/los_interrupt.c
+3
-3
kernel/arch/arm/cortex-m4/iar/los_arch_atomic.h
kernel/arch/arm/cortex-m4/iar/los_arch_atomic.h
+3
-3
kernel/arch/arm/cortex-m4/iar/los_arch_interrupt.h
kernel/arch/arm/cortex-m4/iar/los_arch_interrupt.h
+2
-3
kernel/arch/arm/cortex-m4/iar/los_context.c
kernel/arch/arm/cortex-m4/iar/los_context.c
+1
-1
kernel/arch/arm/cortex-m4/iar/los_interrupt.c
kernel/arch/arm/cortex-m4/iar/los_interrupt.c
+3
-3
kernel/arch/arm/cortex-m7/gcc/los_arch_atomic.h
kernel/arch/arm/cortex-m7/gcc/los_arch_atomic.h
+3
-3
kernel/arch/arm/cortex-m7/gcc/los_arch_interrupt.h
kernel/arch/arm/cortex-m7/gcc/los_arch_interrupt.h
+3
-4
kernel/arch/arm/cortex-m7/gcc/los_context.c
kernel/arch/arm/cortex-m7/gcc/los_context.c
+1
-1
kernel/arch/arm/cortex-m7/gcc/los_exc.S
kernel/arch/arm/cortex-m7/gcc/los_exc.S
+4
-4
kernel/arch/arm/cortex-m7/gcc/los_interrupt.c
kernel/arch/arm/cortex-m7/gcc/los_interrupt.c
+3
-3
kernel/arch/arm/cortex-m7/iar/los_arch_atomic.h
kernel/arch/arm/cortex-m7/iar/los_arch_atomic.h
+3
-3
kernel/arch/arm/cortex-m7/iar/los_arch_interrupt.h
kernel/arch/arm/cortex-m7/iar/los_arch_interrupt.h
+3
-4
kernel/arch/arm/cortex-m7/iar/los_context.c
kernel/arch/arm/cortex-m7/iar/los_context.c
+1
-1
kernel/arch/arm/cortex-m7/iar/los_interrupt.c
kernel/arch/arm/cortex-m7/iar/los_interrupt.c
+2
-2
kernel/arch/csky/v2/gcc/los_arch_atomic.h
kernel/arch/csky/v2/gcc/los_arch_atomic.h
+2
-1
kernel/arch/csky/v2/gcc/los_interrupt.c
kernel/arch/csky/v2/gcc/los_interrupt.c
+0
-11
kernel/arch/csky/v2/gcc/los_timer.c
kernel/arch/csky/v2/gcc/los_timer.c
+0
-12
kernel/arch/risc-v/nuclei/gcc/los_arch_context.h
kernel/arch/risc-v/nuclei/gcc/los_arch_context.h
+1
-1
kernel/arch/risc-v/nuclei/gcc/los_context.c
kernel/arch/risc-v/nuclei/gcc/los_context.c
+0
-11
kernel/arch/risc-v/nuclei/gcc/los_interrupt.c
kernel/arch/risc-v/nuclei/gcc/los_interrupt.c
+0
-11
kernel/arch/risc-v/nuclei/gcc/los_timer.c
kernel/arch/risc-v/nuclei/gcc/los_timer.c
+0
-11
kernel/arch/xtensa/lx6/gcc/los_arch_atomic.h
kernel/arch/xtensa/lx6/gcc/los_arch_atomic.h
+2
-1
kernel/arch/xtensa/lx6/gcc/los_interrupt.c
kernel/arch/xtensa/lx6/gcc/los_interrupt.c
+2
-2
未找到文件。
kernel/arch/arm/arm9/gcc/los_arch_interrupt.h
浏览文件 @
adaefc61
...
...
@@ -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
...
...
kernel/arch/arm/cortex-m3/keil/los_arch_atomic.h
浏览文件 @
adaefc61
...
...
@@ -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 implement
ating
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.
...
...
kernel/arch/arm/cortex-m3/keil/los_arch_interrupt.h
浏览文件 @
adaefc61
...
...
@@ -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-M
4
platform.
* Description: Exception information saved when an exception is triggered on the Cortex-M
3
platform.
*
*/
typedef
struct
TagExcInfo
{
...
...
kernel/arch/arm/cortex-m3/keil/los_context.c
浏览文件 @
adaefc61
...
...
@@ -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
**************************************************************************** */
...
...
kernel/arch/arm/cortex-m3/keil/los_interrupt.c
浏览文件 @
adaefc61
...
...
@@ -52,7 +52,7 @@ LITE_OS_SEC_VEC
#endif
/* *
* @ingroup los_hwi
*
h
ardware interrupt form mapping handling function array.
*
H
ardware 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
*
h
ardware interrupt handler form mapping handling function array.
*
H
ardware 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
;
...
...
kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_atomic.h
浏览文件 @
adaefc61
...
...
@@ -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 implement
ating
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.
...
...
kernel/arch/arm/cortex-m33/gcc/NTZ/los_arch_interrupt.h
浏览文件 @
adaefc61
...
...
@@ -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-M
4
platform.
* Description: Exception information saved when an exception is triggered on the Cortex-M
33
platform.
*
*/
typedef
struct
TagExcInfo
{
...
...
kernel/arch/arm/cortex-m33/gcc/NTZ/los_context.c
浏览文件 @
adaefc61
...
...
@@ -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
**************************************************************************** */
...
...
kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S
浏览文件 @
adaefc61
...
...
@@ -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
}
...
...
kernel/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c
浏览文件 @
adaefc61
...
...
@@ -47,7 +47,7 @@ UINT32 g_intCount = 0;
/* *
* @ingroup los_hwi
*
h
ardware interrupt form mapping handling function array.
*
H
ardware 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
*
h
ardware interrupt handler form mapping handling function array.
*
H
ardware 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
;
...
...
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_atomic.h
浏览文件 @
adaefc61
...
...
@@ -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 implement
ating
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.
...
...
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_context.h
浏览文件 @
adaefc61
...
...
@@ -43,7 +43,7 @@ extern "C" {
typedef
struct
TagTskContext
{
UINT32
secureContext
;
UINT32
stackLmit
;
UINT32
stackL
i
mit
;
UINT32
excReturn
;
#if ((defined(__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
(defined(__FPU_USED) && (__FPU_USED == 1U)))
...
...
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_interrupt.h
浏览文件 @
adaefc61
...
...
@@ -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-M
4
platform.
* Description: Exception information saved when an exception is triggered on the Cortex-M
33
platform.
*
*/
typedef
struct
TagExcInfo
{
...
...
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_context.c
浏览文件 @
adaefc61
...
...
@@ -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
->
stackL
i
mit
=
(
UINT32
)
topStack
;
context
->
excReturn
=
0xFFFFFFBC
;
context
->
uwR4
=
0x04040404L
;
...
...
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S
浏览文件 @
adaefc61
...
...
@@ -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
}
...
...
kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c
浏览文件 @
adaefc61
...
...
@@ -47,7 +47,7 @@ UINT32 g_intCount = 0;
/* *
* @ingroup los_hwi
*
h
ardware interrupt form mapping handling function array.
*
H
ardware 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
*
h
ardware interrupt handler form mapping handling function array.
*
H
ardware 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
;
...
...
kernel/arch/arm/cortex-m33/gcc/los_arch_atomic.h
浏览文件 @
adaefc61
...
...
@@ -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 implement
ating
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.
...
...
kernel/arch/arm/cortex-m33/gcc/los_arch_interrupt.h
浏览文件 @
adaefc61
...
...
@@ -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-M
4
platform.
* Description: Exception information saved when an exception is triggered on the Cortex-M
33
platform.
*
*/
typedef
struct
TagExcInfo
{
...
...
kernel/arch/arm/cortex-m33/gcc/los_context.c
浏览文件 @
adaefc61
...
...
@@ -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
**************************************************************************** */
...
...
kernel/arch/arm/cortex-m33/gcc/los_dispatch.S
浏览文件 @
adaefc61
...
...
@@ -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
==
1
U
)))
...
...
kernel/arch/arm/cortex-m33/gcc/los_exc.S
浏览文件 @
adaefc61
...
...
@@ -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
}
...
...
kernel/arch/arm/cortex-m33/gcc/los_interrupt.c
浏览文件 @
adaefc61
...
...
@@ -47,7 +47,7 @@ UINT32 g_intCount = 0;
/* *
* @ingroup los_hwi
*
h
ardware interrupt form mapping handling function array.
*
H
ardware 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
*
h
ardware interrupt handler form mapping handling function array.
*
H
ardware 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
;
...
...
kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_atomic.h
浏览文件 @
adaefc61
...
...
@@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @brief Atomic auto-decrement.
*
* @par Description:
* This API is used to implement
ating
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>
...
...
kernel/arch/arm/cortex-m33/iar/NTZ/los_arch_interrupt.h
浏览文件 @
adaefc61
...
...
@@ -546,7 +546,7 @@ VOID HalExcMemFault(VOID);
VOID
HalExcBusFault
(
VOID
);
VOID
HalExcUsageFault
(
VOID
);
VOID
HalSVCHandler
(
VOID
);
VOID
HalHwiInit
();
VOID
HalHwiInit
(
VOID
);
/**
...
...
kernel/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c
浏览文件 @
adaefc61
...
...
@@ -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
;
...
...
kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_atomic.h
浏览文件 @
adaefc61
...
...
@@ -78,7 +78,7 @@ STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
* @brief Atomic auto-decrement.
*
* @par Description:
* This API is used to implement
ating
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>
...
...
kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_interrupt.h
浏览文件 @
adaefc61
...
...
@@ -546,7 +546,7 @@ VOID HalExcMemFault(VOID);
VOID
HalExcBusFault
(
VOID
);
VOID
HalExcUsageFault
(
VOID
);
VOID
HalSVCHandler
(
VOID
);
VOID
HalHwiInit
();
VOID
HalHwiInit
(
VOID
);
/**
...
...
kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c
浏览文件 @
adaefc61
...
...
@@ -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
;
...
...
kernel/arch/arm/cortex-m4/gcc/los_arch_atomic.h
浏览文件 @
adaefc61
...
...
@@ -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 implement
ating
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.
...
...
kernel/arch/arm/cortex-m4/gcc/los_arch_interrupt.h
浏览文件 @
adaefc61
...
...
@@ -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
);
/**
...
...
kernel/arch/arm/cortex-m4/gcc/los_context.c
浏览文件 @
adaefc61
...
...
@@ -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
**************************************************************************** */
...
...
kernel/arch/arm/cortex-m4/gcc/los_exc.S
浏览文件 @
adaefc61
...
...
@@ -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
...
...
kernel/arch/arm/cortex-m4/gcc/los_interrupt.c
浏览文件 @
adaefc61
...
...
@@ -52,7 +52,7 @@ LITE_OS_SEC_VEC
#endif
/* *
* @ingroup los_hwi
*
h
ardware interrupt form mapping handling function array.
*
H
ardware 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
*
h
ardware interrupt handler form mapping handling function array.
*
H
ardware 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
;
...
...
kernel/arch/arm/cortex-m4/iar/los_arch_atomic.h
浏览文件 @
adaefc61
...
...
@@ -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 implement
ating
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.
...
...
kernel/arch/arm/cortex-m4/iar/los_arch_interrupt.h
浏览文件 @
adaefc61
...
...
@@ -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
);
/**
...
...
kernel/arch/arm/cortex-m4/iar/los_context.c
浏览文件 @
adaefc61
...
...
@@ -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
**************************************************************************** */
...
...
kernel/arch/arm/cortex-m4/iar/los_interrupt.c
浏览文件 @
adaefc61
...
...
@@ -53,7 +53,7 @@ LITE_OS_SEC_VEC
#endif
/* *
* @ingroup los_hwi
*
h
ardware interrupt form mapping handling function array.
*
H
ardware 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
*
h
ardware interrupt handler form mapping handling function array.
*
H
ardware 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
;
...
...
kernel/arch/arm/cortex-m7/gcc/los_arch_atomic.h
浏览文件 @
adaefc61
...
...
@@ -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 implement
ating
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.
...
...
kernel/arch/arm/cortex-m7/gcc/los_arch_interrupt.h
浏览文件 @
adaefc61
...
...
@@ -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-M
4
platform.
* Description: Exception information saved when an exception is triggered on the Cortex-M
7
platform.
*
*/
typedef
struct
TagExcInfo
{
...
...
kernel/arch/arm/cortex-m7/gcc/los_context.c
浏览文件 @
adaefc61
...
...
@@ -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
**************************************************************************** */
...
...
kernel/arch/arm/cortex-m7/gcc/los_exc.S
浏览文件 @
adaefc61
...
...
@@ -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
}
...
...
kernel/arch/arm/cortex-m7/gcc/los_interrupt.c
浏览文件 @
adaefc61
...
...
@@ -47,7 +47,7 @@ UINT32 g_intCount = 0;
/* *
* @ingroup los_hwi
*
h
ardware interrupt form mapping handling function array.
*
H
ardware 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
*
h
ardware interrupt handler form mapping handling function array.
*
H
ardware 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
;
...
...
kernel/arch/arm/cortex-m7/iar/los_arch_atomic.h
浏览文件 @
adaefc61
...
...
@@ -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 implement
ating
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.
...
...
kernel/arch/arm/cortex-m7/iar/los_arch_interrupt.h
浏览文件 @
adaefc61
...
...
@@ -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-M
4
platform.
* Description: Exception information saved when an exception is triggered on the Cortex-M
7
platform.
*
*/
typedef
struct
TagExcInfo
{
...
...
kernel/arch/arm/cortex-m7/iar/los_context.c
浏览文件 @
adaefc61
...
...
@@ -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
**************************************************************************** */
...
...
kernel/arch/arm/cortex-m7/iar/los_interrupt.c
浏览文件 @
adaefc61
...
...
@@ -49,7 +49,7 @@ UINT32 g_intCount = 0;
#pragma data_alignment=0x100
/* *
* @ingroup los_hwi
*
h
ardware interrupt form mapping handling function array.
*
H
ardware 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
*
h
ardware interrupt handler form mapping handling function array.
*
H
ardware interrupt handler form mapping handling function array.
*/
STATIC
HWI_HANDLER_FUNC
g_hwiHandlerForm
[
OS_VECTOR_CNT
]
=
{{
(
HWI_PROC_FUNC
)
0
,
(
HWI_ARG_T
)
0
}};
...
...
kernel/arch/csky/v2/gcc/los_arch_atomic.h
浏览文件 @
adaefc61
...
...
@@ -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.
*
...
...
kernel/arch/csky/v2/gcc/los_interrupt.c
浏览文件 @
adaefc61
...
...
@@ -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 */
kernel/arch/csky/v2/gcc/los_timer.c
浏览文件 @
adaefc61
...
...
@@ -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 */
kernel/arch/risc-v/nuclei/gcc/los_arch_context.h
浏览文件 @
adaefc61
...
...
@@ -90,4 +90,4 @@ extern VOID HalStartToRun(VOID);
#endif
/* __cplusplus */
#endif
/* __cplusplus */
#endif
/* _LOS_
HW
_H */
#endif
/* _LOS_
ARCH_CONTEXT
_H */
kernel/arch/risc-v/nuclei/gcc/los_context.c
浏览文件 @
adaefc61
...
...
@@ -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 */
kernel/arch/risc-v/nuclei/gcc/los_interrupt.c
浏览文件 @
adaefc61
...
...
@@ -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 */
kernel/arch/risc-v/nuclei/gcc/los_timer.c
浏览文件 @
adaefc61
...
...
@@ -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 */
kernel/arch/xtensa/lx6/gcc/los_arch_atomic.h
浏览文件 @
adaefc61
...
...
@@ -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.
*
...
...
kernel/arch/xtensa/lx6/gcc/los_interrupt.c
浏览文件 @
adaefc61
...
...
@@ -59,7 +59,7 @@ typedef struct {
/* *
* @ingroup los_hwi
*
h
ardware interrupt handler form mapping handling function array.
*
H
ardware 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
*
H
ardware interrupt handler form mapping handling function array.
*
h
ardware interrupt handler form mapping handling function array.
*/
STATIC
HWI_PROC_FUNC
g_hwiHandlerForm
[
OS_VECTOR_CNT
]
=
{
0
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录