summaryrefslogtreecommitdiff
path: root/libcpu/arm/cortex-m33
diff options
context:
space:
mode:
authorliuxianliang <[email protected]>2021-04-06 10:42:58 +0800
committerliuxianliang <[email protected]>2021-04-06 10:42:58 +0800
commit233e1cd8bc7cbdc38006dfc18adde8bc2595620f (patch)
treecec4669f56b09734b7dcc2682d854fef325722b8 /libcpu/arm/cortex-m33
parent4431c4796fb3e26fb66c012feb8bf47f3292b473 (diff)
parentc5a0df2254bd6fadc941a33d9066ce6b972c4274 (diff)
Merge branch 'master' of https://github.com/RT-Thread/rt-thread into develop_one
Diffstat (limited to 'libcpu/arm/cortex-m33')
-rw-r--r--libcpu/arm/cortex-m33/cpuport.c4
-rw-r--r--libcpu/arm/cortex-m33/trustzone.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/libcpu/arm/cortex-m33/cpuport.c b/libcpu/arm/cortex-m33/cpuport.c
index 41325105d7..928689d9c8 100644
--- a/libcpu/arm/cortex-m33/cpuport.c
+++ b/libcpu/arm/cortex-m33/cpuport.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -457,7 +457,7 @@ RT_WEAK void rt_hw_cpu_reset(void)
* @return return the index of the first bit set. If value is 0, then this function
* shall return 0.
*/
-#if defined(__CC_ARM)
+#if defined(__CC_ARM)
__asm int __rt_ffs(int value)
{
CMP r0, #0x00
diff --git a/libcpu/arm/cortex-m33/trustzone.c b/libcpu/arm/cortex-m33/trustzone.c
index 5f37ddbb8f..f49f0c24f8 100644
--- a/libcpu/arm/cortex-m33/trustzone.c
+++ b/libcpu/arm/cortex-m33/trustzone.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2019, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -31,7 +31,7 @@ extern int tzcall(int id, rt_ubase_t arg0, rt_ubase_t arg1, rt_ubase_t arg2);
rt_ubase_t rt_trustzone_current_context;
-#if defined(__CC_ARM)
+#if defined(__CC_ARM)
static __inline rt_uint32_t __get_IPSR(void)
{
register rt_uint32_t result __asm("ipsr");
@@ -78,7 +78,7 @@ rt_err_t rt_trustzone_enter(rt_ubase_t module)
rt_trustzone_init();
if (tzcall(TZ_ALLOC_CONTEXT_ID, module, 0, 0))
{
- return RT_EOK;
+ return RT_EOK;
}
return -RT_ERROR;
}