You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/01/03 18:45:53 UTC
[incubator-nuttx] branch master updated: xtensa: Rename up_stack_color to xtensa_stack_color since it's an internal function.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 4edc5fb xtensa: Rename up_stack_color to xtensa_stack_color since it's an internal function.
4edc5fb is described below
commit 4edc5fb7011164f9635b37a021d0f0ad9dd76982
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Mon Jan 3 12:04:54 2022 +0100
xtensa: Rename up_stack_color to xtensa_stack_color since it's an
internal function.
Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
arch/xtensa/src/common/xtensa.h | 2 +-
arch/xtensa/src/common/xtensa_createstack.c | 6 +++---
arch/xtensa/src/common/xtensa_initialstate.c | 2 +-
arch/xtensa/src/common/xtensa_usestack.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/xtensa/src/common/xtensa.h b/arch/xtensa/src/common/xtensa.h
index 255324e..969fa5c 100644
--- a/arch/xtensa/src/common/xtensa.h
+++ b/arch/xtensa/src/common/xtensa.h
@@ -344,7 +344,7 @@ void xtensa_pminitialize(void);
/* Debug ********************************************************************/
#ifdef CONFIG_STACK_COLORATION
-void up_stack_color(void *stackbase, size_t nbytes);
+void xtensa_stack_color(void *stackbase, size_t nbytes);
#endif
#endif /* __ASSEMBLY__ */
diff --git a/arch/xtensa/src/common/xtensa_createstack.c b/arch/xtensa/src/common/xtensa_createstack.c
index 8d13257..4549f7b 100644
--- a/arch/xtensa/src/common/xtensa_createstack.c
+++ b/arch/xtensa/src/common/xtensa_createstack.c
@@ -251,7 +251,7 @@ int up_create_stack(struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
* water marks.
*/
- up_stack_color(tcb->stack_base_ptr, tcb->adj_stack_size);
+ xtensa_stack_color(tcb->stack_base_ptr, tcb->adj_stack_size);
#endif
tcb->flags |= TCB_FLAG_FREE_STACK;
@@ -263,7 +263,7 @@ int up_create_stack(struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
}
/****************************************************************************
- * Name: up_stack_color
+ * Name: xtensa_stack_color
*
* Description:
* Write a well know value into the stack
@@ -271,7 +271,7 @@ int up_create_stack(struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
****************************************************************************/
#ifdef CONFIG_STACK_COLORATION
-void up_stack_color(void *stackbase, size_t nbytes)
+void xtensa_stack_color(void *stackbase, size_t nbytes)
{
uintptr_t start;
uintptr_t end;
diff --git a/arch/xtensa/src/common/xtensa_initialstate.c b/arch/xtensa/src/common/xtensa_initialstate.c
index f106a62..5557c58 100644
--- a/arch/xtensa/src/common/xtensa_initialstate.c
+++ b/arch/xtensa/src/common/xtensa_initialstate.c
@@ -72,7 +72,7 @@ void up_initial_state(struct tcb_s *tcb)
* water marks.
*/
- up_stack_color(tcb->stack_alloc_ptr, 0);
+ xtensa_stack_color(tcb->stack_alloc_ptr, 0);
#endif /* CONFIG_STACK_COLORATION */
}
diff --git a/arch/xtensa/src/common/xtensa_usestack.c b/arch/xtensa/src/common/xtensa_usestack.c
index 84657a9..a3a2d59 100644
--- a/arch/xtensa/src/common/xtensa_usestack.c
+++ b/arch/xtensa/src/common/xtensa_usestack.c
@@ -132,7 +132,7 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
* water marks.
*/
- up_stack_color(tcb->stack_base_ptr, tcb->adj_stack_size);
+ xtensa_stack_color(tcb->stack_base_ptr, tcb->adj_stack_size);
#endif
return OK;