sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch: Remove the unnecessary #if/#endif in assert

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-07-07 11:02:56 +08:00 committed by Petro Karashchenko
parent 9ff0971d3f
commit 3daa18b661
3 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/src/common/arm_assert.c
View File

@ -284,20 +284,17 @@ static void arm_showtasks(void)
# ifdef CONFIG_SMP # ifdef CONFIG_SMP
" ----" " ----"
# endif # endif
" %7lu" " %7u"
# ifdef CONFIG_STACK_COLORATION # ifdef CONFIG_STACK_COLORATION
" %7lu %3" PRId32 ".%1" PRId32 "%%%c" " %7" PRId32 " %3" PRId32 ".%1" PRId32 "%%%c"
# endif # endif
# ifdef CONFIG_SCHED_CPULOAD # ifdef CONFIG_SCHED_CPULOAD
" ----" " ----"
# endif # endif
# if CONFIG_TASK_NAME_SIZE > 0 " irq\n"
" irq" , (CONFIG_ARCH_INTERRUPTSTACK & ~7)
# endif
"\n"
, (unsigned long)(CONFIG_ARCH_INTERRUPTSTACK & ~7)
# ifdef CONFIG_STACK_COLORATION # ifdef CONFIG_STACK_COLORATION
, (unsigned long)stack_used , stack_used
, stack_filled / 10, stack_filled % 10, , stack_filled / 10, stack_filled % 10,
(stack_filled >= 10 * 80 ? '!' : ' ') (stack_filled >= 10 * 80 ? '!' : ' ')
# endif # endif

13
arch/risc-v/src/common/riscv_assert.c
View File

@ -284,20 +284,17 @@ static inline void riscv_showtasks(void)
# ifdef CONFIG_SMP # ifdef CONFIG_SMP
" ----" " ----"
# endif # endif
" %7lu" " %7u"
# ifdef CONFIG_STACK_COLORATION # ifdef CONFIG_STACK_COLORATION
" %7lu %3" PRId32 ".%1" PRId32 "%%%c" " %7" PRId32 " %3" PRId32 ".%1" PRId32 "%%%c"
# endif # endif
# ifdef CONFIG_SCHED_CPULOAD # ifdef CONFIG_SCHED_CPULOAD
" ----" " ----"
# endif # endif
# if CONFIG_TASK_NAME_SIZE > 0 " irq\n"
" irq" , (CONFIG_ARCH_INTERRUPTSTACK & ~15)
# endif
"\n"
, (unsigned long)(CONFIG_ARCH_INTERRUPTSTACK & ~15)
# ifdef CONFIG_STACK_COLORATION # ifdef CONFIG_STACK_COLORATION
, (unsigned long)stack_used , stack_used
, stack_filled / 10, stack_filled % 10, , stack_filled / 10, stack_filled % 10,
(stack_filled >= 10 * 80 ? '!' : ' ') (stack_filled >= 10 * 80 ? '!' : ' ')
# endif # endif

15
arch/xtensa/src/common/xtensa_dumpstate.c
View File

@ -122,9 +122,7 @@ static void xtensa_dump_task(struct tcb_s *tcb, void *arg)
#ifdef CONFIG_SCHED_CPULOAD #ifdef CONFIG_SCHED_CPULOAD
" %3" PRId32 ".%01" PRId32 "%%" " %3" PRId32 ".%01" PRId32 "%%"
#endif #endif
#if CONFIG_TASK_NAME_SIZE > 0
" %s%s\n" " %s%s\n"
#endif
, tcb->pid, tcb->sched_priority , tcb->pid, tcb->sched_priority
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
, tcb->cpu , tcb->cpu
@ -201,20 +199,17 @@ static inline void xtensa_showtasks(void)
# ifdef CONFIG_SMP # ifdef CONFIG_SMP
" ----" " ----"
# endif # endif
" %7lu" " %7u"
# ifdef CONFIG_STACK_COLORATION # ifdef CONFIG_STACK_COLORATION
" %7lu %3" PRId32 ".%1" PRId32 "%%%c" " %7" PRId32 " %3" PRId32 ".%1" PRId32 "%%%c"
# endif # endif
# ifdef CONFIG_SCHED_CPULOAD # ifdef CONFIG_SCHED_CPULOAD
" ----" " ----"
# endif # endif
# if CONFIG_TASK_NAME_SIZE > 0 " irq\n"
" irq" , (CONFIG_ARCH_INTERRUPTSTACK & ~15)
# endif
"\n"
, (unsigned long)(CONFIG_ARCH_INTERRUPTSTACK & ~15)
# ifdef CONFIG_STACK_COLORATION # ifdef CONFIG_STACK_COLORATION
, (unsigned long)stack_used , stack_used
, stack_filled / 10, stack_filled % 10, , stack_filled / 10, stack_filled % 10,
(stack_filled >= 10 * 80 ? '!' : ' ') (stack_filled >= 10 * 80 ? '!' : ' ')
# endif # endif