From 1997113fbca8894dcaad75a6fa4e7b42396a4031 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Sat, 28 Aug 2021 16:48:08 -0400 Subject: [PATCH] =?UTF-8?q?FINSH=5FUSING=5FBUILT=5FIN=5FCOMMANDS=E6=94=B9M?= =?UTF-8?q?SH=5FUSING=5FBUILT=5FIN=5FCOMMANDS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/allwinner_tina/libcpu/trap.c | 8 ++++---- bsp/bluetrum/ab32vg1-ab-prougen/board/board.c | 2 +- bsp/dm365/platform/trap.c | 8 ++++---- bsp/imx6sx/cortex-a9/cpu/trap.c | 12 ++++++------ bsp/qemu-vexpress-gemini/cpu/trap.c | 12 ++++++------ bsp/raspberry-pi/raspi2/cpu/trap.c | 12 ++++++------ bsp/raspberry-pi/raspi3-32/cpu/trap.c | 12 ++++++------ components/finsh/Kconfig | 2 +- components/finsh/SConscript | 2 +- components/finsh/msh.c | 4 ++-- libcpu/aarch64/cortex-a53/trap.c | 4 ++-- libcpu/aarch64/cortex-a72/trap.c | 4 ++-- libcpu/arm/am335x/trap.c | 8 ++++---- libcpu/arm/arm926/trap.c | 8 ++++---- libcpu/arm/cortex-a/trap.c | 12 ++++++------ libcpu/arm/cortex-m0/cpuport.c | 4 ++-- libcpu/arm/cortex-m23/cpuport.c | 4 ++-- libcpu/arm/cortex-m3/cpuport.c | 4 ++-- libcpu/arm/cortex-m33/cpuport.c | 4 ++-- libcpu/arm/cortex-m4/cpuport.c | 4 ++-- libcpu/arm/cortex-m7/cpuport.c | 4 ++-- libcpu/arm/cortex-r4/trap.c | 8 ++++---- libcpu/arm/realview-a8-vmm/trap.c | 12 ++++++------ libcpu/arm/s3c24x0/trap.c | 8 ++++---- libcpu/arm/zynqmp-r5/trap.c | 12 ++++++------ libcpu/risc-v/k210/interrupt.c | 4 ++-- libcpu/risc-v/virt64/interrupt.c | 4 ++-- libcpu/rx/cpuport.c | 4 ++-- src/memheap.c | 4 ++-- 29 files changed, 95 insertions(+), 95 deletions(-) diff --git a/bsp/allwinner_tina/libcpu/trap.c b/bsp/allwinner_tina/libcpu/trap.c index 66f3e2ecb6..2017f33759 100644 --- a/bsp/allwinner_tina/libcpu/trap.c +++ b/bsp/allwinner_tina/libcpu/trap.c @@ -15,7 +15,7 @@ #define INT_FIQ 0x01 extern struct rt_thread *rt_current_thread; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -89,7 +89,7 @@ void rt_hw_trap_udef(struct rt_hw_register *regs) rt_kprintf("undefined instruction\n"); rt_kprintf("thread - %s stack:\n", rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -141,7 +141,7 @@ void rt_hw_trap_pabt(struct rt_hw_register *regs) rt_kprintf("prefetch abort\n"); rt_kprintf("thread - %s stack:\n", RT_NAME_MAX, rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -169,7 +169,7 @@ void rt_hw_trap_dabt(struct rt_hw_register *regs) rt_kprintf("data abort\n"); rt_kprintf("thread - %s stack:\n", RT_NAME_MAX, rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/bsp/bluetrum/ab32vg1-ab-prougen/board/board.c b/bsp/bluetrum/ab32vg1-ab-prougen/board/board.c index 92753a361c..32714f6a4d 100644 --- a/bsp/bluetrum/ab32vg1-ab-prougen/board/board.c +++ b/bsp/bluetrum/ab32vg1-ab-prougen/board/board.c @@ -209,7 +209,7 @@ void rt_hw_console_output(const char *str) RT_SECTION(".irq.err") void exception_isr(void) { -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif sys_error_hook(1); diff --git a/bsp/dm365/platform/trap.c b/bsp/dm365/platform/trap.c index c1636a5ab0..68b834b9d8 100644 --- a/bsp/dm365/platform/trap.c +++ b/bsp/dm365/platform/trap.c @@ -20,7 +20,7 @@ /*@{*/ extern struct rt_thread *rt_current_thread; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -56,7 +56,7 @@ void rt_hw_trap_udef(struct rt_hw_register *regs) rt_kprintf("undefined instruction\n"); rt_kprintf("thread - %s stack:\n", rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -94,7 +94,7 @@ void rt_hw_trap_pabt(struct rt_hw_register *regs) rt_kprintf("prefetch abort\n"); rt_kprintf("thread - %s stack:\n", rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -130,7 +130,7 @@ void rt_hw_trap_dabt(struct rt_hw_register *regs) rt_kprintf("data abort\n"); rt_kprintf("thread - %s stack:\n", rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/bsp/imx6sx/cortex-a9/cpu/trap.c b/bsp/imx6sx/cortex-a9/cpu/trap.c index 451a2f40db..4625d1accf 100644 --- a/bsp/imx6sx/cortex-a9/cpu/trap.c +++ b/bsp/imx6sx/cortex-a9/cpu/trap.c @@ -17,7 +17,7 @@ #include "gic.h" extern struct rt_thread *rt_current_thread; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -49,7 +49,7 @@ void rt_hw_trap_undef(struct rt_hw_exp_stack *regs) { rt_kprintf("undefined instruction:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -68,7 +68,7 @@ void rt_hw_trap_swi(struct rt_hw_exp_stack *regs) { rt_kprintf("software interrupt:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -86,7 +86,7 @@ void rt_hw_trap_pabt(struct rt_hw_exp_stack *regs) { rt_kprintf("prefetch abort:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -104,7 +104,7 @@ void rt_hw_trap_dabt(struct rt_hw_exp_stack *regs) { rt_kprintf("data abort:"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -121,7 +121,7 @@ void rt_hw_trap_resv(struct rt_hw_exp_stack *regs) { rt_kprintf("reserved trap:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/bsp/qemu-vexpress-gemini/cpu/trap.c b/bsp/qemu-vexpress-gemini/cpu/trap.c index 319dba851c..86eceb39cf 100644 --- a/bsp/qemu-vexpress-gemini/cpu/trap.c +++ b/bsp/qemu-vexpress-gemini/cpu/trap.c @@ -21,7 +21,7 @@ #include "gic.h" extern struct rt_thread *rt_current_thread; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -53,7 +53,7 @@ void rt_hw_trap_undef(struct rt_hw_exp_stack *regs) { rt_kprintf("undefined instruction:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -72,7 +72,7 @@ void rt_hw_trap_swi(struct rt_hw_exp_stack *regs) { rt_kprintf("software interrupt:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -90,7 +90,7 @@ void rt_hw_trap_pabt(struct rt_hw_exp_stack *regs) { rt_kprintf("prefetch abort:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -108,7 +108,7 @@ void rt_hw_trap_dabt(struct rt_hw_exp_stack *regs) { rt_kprintf("data abort:"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -125,7 +125,7 @@ void rt_hw_trap_resv(struct rt_hw_exp_stack *regs) { rt_kprintf("reserved trap:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/bsp/raspberry-pi/raspi2/cpu/trap.c b/bsp/raspberry-pi/raspi2/cpu/trap.c index a8c3d5be0e..ef2f141546 100644 --- a/bsp/raspberry-pi/raspi2/cpu/trap.c +++ b/bsp/raspberry-pi/raspi2/cpu/trap.c @@ -15,7 +15,7 @@ #include "armv7.h" extern struct rt_thread *rt_current_thread; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -47,7 +47,7 @@ void rt_hw_trap_undef(struct rt_hw_exp_stack *regs) { rt_kprintf("undefined instruction:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -66,7 +66,7 @@ void rt_hw_trap_swi(struct rt_hw_exp_stack *regs) { rt_kprintf("software interrupt:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -84,7 +84,7 @@ void rt_hw_trap_pabt(struct rt_hw_exp_stack *regs) { rt_kprintf("prefetch abort:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -102,7 +102,7 @@ void rt_hw_trap_dabt(struct rt_hw_exp_stack *regs) { rt_kprintf("data abort:"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -119,7 +119,7 @@ void rt_hw_trap_resv(struct rt_hw_exp_stack *regs) { rt_kprintf("reserved trap:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/bsp/raspberry-pi/raspi3-32/cpu/trap.c b/bsp/raspberry-pi/raspi3-32/cpu/trap.c index 8a9cf9b133..3fcd16481e 100644 --- a/bsp/raspberry-pi/raspi3-32/cpu/trap.c +++ b/bsp/raspberry-pi/raspi3-32/cpu/trap.c @@ -18,7 +18,7 @@ #include "armv7.h" extern struct rt_thread *rt_current_thread; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -52,7 +52,7 @@ void rt_hw_trap_undef(struct rt_hw_exp_stack *regs) { rt_kprintf("undefined instruction:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -71,7 +71,7 @@ void rt_hw_trap_swi(struct rt_hw_exp_stack *regs) { rt_kprintf("software interrupt:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -89,7 +89,7 @@ void rt_hw_trap_pabt(struct rt_hw_exp_stack *regs) { rt_kprintf("prefetch abort:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -107,7 +107,7 @@ void rt_hw_trap_dabt(struct rt_hw_exp_stack *regs) { rt_kprintf("data abort:"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -124,7 +124,7 @@ void rt_hw_trap_resv(struct rt_hw_exp_stack *regs) { rt_kprintf("reserved trap:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/components/finsh/Kconfig b/components/finsh/Kconfig index 1a980b06aa..cf4e673c75 100644 --- a/components/finsh/Kconfig +++ b/components/finsh/Kconfig @@ -41,7 +41,7 @@ if RT_USING_MSH int "The command line size for shell" default 80 - config FINSH_USING_BUILT_IN_COMMANDS + config MSH_USING_BUILT_IN_COMMANDS bool "Enable built-in commands, such as list_thread" default y diff --git a/components/finsh/SConscript b/components/finsh/SConscript index 65395f346b..28fe02bac5 100644 --- a/components/finsh/SConscript +++ b/components/finsh/SConscript @@ -6,7 +6,7 @@ shell.c msh.c ''') -if GetDepend('FINSH_USING_BUILT_IN_COMMANDS'): +if GetDepend('MSH_USING_BUILT_IN_COMMANDS'): src += ['cmd.c'] if GetDepend('RT_USING_DFS'): diff --git a/components/finsh/msh.c b/components/finsh/msh.c index a0680e2ce9..86985c561c 100644 --- a/components/finsh/msh.c +++ b/components/finsh/msh.c @@ -54,7 +54,7 @@ int msh_help(int argc, char **argv) } MSH_CMD_EXPORT_ALIAS(msh_help, help, RT - Thread shell help.); -#ifdef FINSH_USING_BUILT_IN_COMMANDS +#ifdef MSH_USING_BUILT_IN_COMMANDS int cmd_ps(int argc, char **argv) { extern long list_thread(void); @@ -85,7 +85,7 @@ int cmd_free(int argc, char **argv) } MSH_CMD_EXPORT_ALIAS(cmd_free, free, Show the memory usage in the system.); #endif /* RT_USING_HEAP */ -#endif /* FINSH_USING_BUILT_IN_COMMANDS */ +#endif /* MSH_USING_BUILT_IN_COMMANDS */ static int msh_split(char *cmd, rt_size_t length, char *argv[FINSH_ARG_MAX]) { diff --git a/libcpu/aarch64/cortex-a53/trap.c b/libcpu/aarch64/cortex-a53/trap.c index 4837d445d4..6002713543 100644 --- a/libcpu/aarch64/cortex-a53/trap.c +++ b/libcpu/aarch64/cortex-a53/trap.c @@ -19,7 +19,7 @@ #endif extern struct rt_thread *rt_current_thread; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -55,7 +55,7 @@ void rt_hw_trap_error(struct rt_hw_exp_stack *regs) { rt_kprintf("error exception:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/libcpu/aarch64/cortex-a72/trap.c b/libcpu/aarch64/cortex-a72/trap.c index b89a2cca70..ba96f03a69 100644 --- a/libcpu/aarch64/cortex-a72/trap.c +++ b/libcpu/aarch64/cortex-a72/trap.c @@ -14,7 +14,7 @@ #include "armv8.h" extern struct rt_thread *rt_current_thread; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -50,7 +50,7 @@ void rt_hw_trap_error(struct rt_hw_exp_stack *regs) { rt_kprintf("error exception:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/libcpu/arm/am335x/trap.c b/libcpu/arm/am335x/trap.c index 94da0063d0..19cb31ad67 100644 --- a/libcpu/arm/am335x/trap.c +++ b/libcpu/arm/am335x/trap.c @@ -24,7 +24,7 @@ /*@{*/ extern struct rt_thread *rt_current_thread; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -67,7 +67,7 @@ void rt_hw_trap_udef(struct rt_hw_register *regs) rt_kprintf("undefined instruction\n"); rt_kprintf("thread %.*s stack:\n", RT_NAME_MAX, rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -105,7 +105,7 @@ void rt_hw_trap_pabt(struct rt_hw_register *regs) rt_kprintf("prefetch abort\n"); rt_kprintf("thread %.*s stack:\n", RT_NAME_MAX, rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -133,7 +133,7 @@ void rt_hw_trap_dabt(struct rt_hw_register *regs) rt_kprintf("data abort\n"); rt_kprintf("thread %.*s stack:\n", RT_NAME_MAX, rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/libcpu/arm/arm926/trap.c b/libcpu/arm/arm926/trap.c index 5751636259..c1b1ffe912 100644 --- a/libcpu/arm/arm926/trap.c +++ b/libcpu/arm/arm926/trap.c @@ -16,7 +16,7 @@ #define INT_FIQ 0x01 extern struct rt_thread *rt_current_thread; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -90,7 +90,7 @@ void rt_hw_trap_udef(struct rt_hw_register *regs) rt_kprintf("undefined instruction\n"); rt_kprintf("thread - %s stack:\n", rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -142,7 +142,7 @@ void rt_hw_trap_pabt(struct rt_hw_register *regs) rt_kprintf("prefetch abort\n"); rt_kprintf("thread - %s stack:\n", RT_NAME_MAX, rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -170,7 +170,7 @@ void rt_hw_trap_dabt(struct rt_hw_register *regs) rt_kprintf("data abort\n"); rt_kprintf("thread - %s stack:\n", RT_NAME_MAX, rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/libcpu/arm/cortex-a/trap.c b/libcpu/arm/cortex-a/trap.c index a215374348..814db418cd 100644 --- a/libcpu/arm/cortex-a/trap.c +++ b/libcpu/arm/cortex-a/trap.c @@ -15,7 +15,7 @@ #include "armv7.h" #include "interrupt.h" -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -89,7 +89,7 @@ void rt_hw_trap_undef(struct rt_hw_exp_stack *regs) { rt_kprintf("undefined instruction:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -115,7 +115,7 @@ void rt_hw_trap_swi(struct rt_hw_exp_stack *regs) { rt_kprintf("software interrupt:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -140,7 +140,7 @@ void rt_hw_trap_pabt(struct rt_hw_exp_stack *regs) { rt_kprintf("prefetch abort:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -165,7 +165,7 @@ void rt_hw_trap_dabt(struct rt_hw_exp_stack *regs) { rt_kprintf("data abort:"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -189,7 +189,7 @@ void rt_hw_trap_resv(struct rt_hw_exp_stack *regs) { rt_kprintf("reserved trap:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/libcpu/arm/cortex-m0/cpuport.c b/libcpu/arm/cortex-m0/cpuport.c index d6c9be11cf..af343aa8b2 100644 --- a/libcpu/arm/cortex-m0/cpuport.c +++ b/libcpu/arm/cortex-m0/cpuport.c @@ -90,7 +90,7 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, return stk; } -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif extern rt_thread_t rt_current_thread; @@ -110,7 +110,7 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame *contex) rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif diff --git a/libcpu/arm/cortex-m23/cpuport.c b/libcpu/arm/cortex-m23/cpuport.c index 4619534c05..a3b18f5f35 100644 --- a/libcpu/arm/cortex-m23/cpuport.c +++ b/libcpu/arm/cortex-m23/cpuport.c @@ -91,7 +91,7 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, return stk; } -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif extern rt_thread_t rt_current_thread; @@ -111,7 +111,7 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame *contex) rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif diff --git a/libcpu/arm/cortex-m3/cpuport.c b/libcpu/arm/cortex-m3/cpuport.c index 02f84564d5..d376f00424 100644 --- a/libcpu/arm/cortex-m3/cpuport.c +++ b/libcpu/arm/cortex-m3/cpuport.c @@ -291,7 +291,7 @@ struct exception_info */ void rt_hw_hard_fault_exception(struct exception_info * exception_info) { -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif struct stack_frame* context = &exception_info->stack_frame; @@ -327,7 +327,7 @@ void rt_hw_hard_fault_exception(struct exception_info * exception_info) { rt_kprintf("hard fault on thread: %s\r\n\r\n", rt_thread_self()->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif } diff --git a/libcpu/arm/cortex-m33/cpuport.c b/libcpu/arm/cortex-m33/cpuport.c index 8f73985f87..aa2325012c 100644 --- a/libcpu/arm/cortex-m33/cpuport.c +++ b/libcpu/arm/cortex-m33/cpuport.c @@ -373,7 +373,7 @@ struct exception_info void rt_hw_hard_fault_exception(struct exception_info *exception_info) { -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif struct exception_stack_frame *exception_stack = &exception_info->stack_frame.exception_stack_frame; @@ -409,7 +409,7 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info) { rt_kprintf("hard fault on thread: %s\r\n\r\n", rt_thread_self()->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif } diff --git a/libcpu/arm/cortex-m4/cpuport.c b/libcpu/arm/cortex-m4/cpuport.c index 8dfcbe9cc4..f24c33cf4d 100644 --- a/libcpu/arm/cortex-m4/cpuport.c +++ b/libcpu/arm/cortex-m4/cpuport.c @@ -370,7 +370,7 @@ struct exception_info void rt_hw_hard_fault_exception(struct exception_info *exception_info) { -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif struct exception_stack_frame *exception_stack = &exception_info->stack_frame.exception_stack_frame; @@ -406,7 +406,7 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info) { rt_kprintf("hard fault on thread: %s\r\n\r\n", rt_thread_self()->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif } diff --git a/libcpu/arm/cortex-m7/cpuport.c b/libcpu/arm/cortex-m7/cpuport.c index 8dfcbe9cc4..f24c33cf4d 100644 --- a/libcpu/arm/cortex-m7/cpuport.c +++ b/libcpu/arm/cortex-m7/cpuport.c @@ -370,7 +370,7 @@ struct exception_info void rt_hw_hard_fault_exception(struct exception_info *exception_info) { -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif struct exception_stack_frame *exception_stack = &exception_info->stack_frame.exception_stack_frame; @@ -406,7 +406,7 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info) { rt_kprintf("hard fault on thread: %s\r\n\r\n", rt_thread_self()->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif } diff --git a/libcpu/arm/cortex-r4/trap.c b/libcpu/arm/cortex-r4/trap.c index 9cb24026f0..3ff3d297c0 100644 --- a/libcpu/arm/cortex-r4/trap.c +++ b/libcpu/arm/cortex-r4/trap.c @@ -67,7 +67,7 @@ void rt_hw_trap_svc(struct rt_hw_exp_stack *regs) { rt_kprintf("software interrupt\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -85,7 +85,7 @@ void rt_hw_trap_pabt(struct rt_hw_exp_stack *regs) { rt_kprintf("prefetch abort\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -103,7 +103,7 @@ void rt_hw_trap_dabt(struct rt_hw_exp_stack *regs) { rt_kprintf("Data Abort "); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -120,7 +120,7 @@ void rt_hw_trap_resv(struct rt_hw_exp_stack *regs) { rt_kprintf("Reserved trap\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/libcpu/arm/realview-a8-vmm/trap.c b/libcpu/arm/realview-a8-vmm/trap.c index 319dba851c..86eceb39cf 100644 --- a/libcpu/arm/realview-a8-vmm/trap.c +++ b/libcpu/arm/realview-a8-vmm/trap.c @@ -21,7 +21,7 @@ #include "gic.h" extern struct rt_thread *rt_current_thread; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -53,7 +53,7 @@ void rt_hw_trap_undef(struct rt_hw_exp_stack *regs) { rt_kprintf("undefined instruction:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -72,7 +72,7 @@ void rt_hw_trap_swi(struct rt_hw_exp_stack *regs) { rt_kprintf("software interrupt:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -90,7 +90,7 @@ void rt_hw_trap_pabt(struct rt_hw_exp_stack *regs) { rt_kprintf("prefetch abort:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -108,7 +108,7 @@ void rt_hw_trap_dabt(struct rt_hw_exp_stack *regs) { rt_kprintf("data abort:"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -125,7 +125,7 @@ void rt_hw_trap_resv(struct rt_hw_exp_stack *regs) { rt_kprintf("reserved trap:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/libcpu/arm/s3c24x0/trap.c b/libcpu/arm/s3c24x0/trap.c index 29190dce4e..c4be806dc6 100644 --- a/libcpu/arm/s3c24x0/trap.c +++ b/libcpu/arm/s3c24x0/trap.c @@ -22,7 +22,7 @@ /*@{*/ extern struct rt_thread *rt_current_thread; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -58,7 +58,7 @@ void rt_hw_trap_udef(struct rt_hw_register *regs) rt_kprintf("undefined instruction\n"); rt_kprintf("thread - %s stack:\n", rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -96,7 +96,7 @@ void rt_hw_trap_pabt(struct rt_hw_register *regs) rt_kprintf("prefetch abort\n"); rt_kprintf("thread - %s stack:\n", rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -117,7 +117,7 @@ void rt_hw_trap_dabt(struct rt_hw_register *regs) rt_kprintf("data abort\n"); rt_kprintf("thread - %s stack:\n", rt_current_thread->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/libcpu/arm/zynqmp-r5/trap.c b/libcpu/arm/zynqmp-r5/trap.c index 9ec5d1a568..5db5a0c01b 100644 --- a/libcpu/arm/zynqmp-r5/trap.c +++ b/libcpu/arm/zynqmp-r5/trap.c @@ -16,7 +16,7 @@ #include "armv7.h" #include "interrupt.h" -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(void); #endif @@ -48,7 +48,7 @@ void rt_hw_trap_undef(struct rt_hw_exp_stack *regs) { rt_kprintf("undefined instruction:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -67,7 +67,7 @@ void rt_hw_trap_swi(struct rt_hw_exp_stack *regs) { rt_kprintf("software interrupt:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -85,7 +85,7 @@ void rt_hw_trap_pabt(struct rt_hw_exp_stack *regs) { rt_kprintf("prefetch abort:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -103,7 +103,7 @@ void rt_hw_trap_dabt(struct rt_hw_exp_stack *regs) { rt_kprintf("data abort:"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); @@ -120,7 +120,7 @@ void rt_hw_trap_resv(struct rt_hw_exp_stack *regs) { rt_kprintf("reserved trap:\n"); rt_hw_show_register(regs); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif rt_hw_cpu_shutdown(); diff --git a/libcpu/risc-v/k210/interrupt.c b/libcpu/risc-v/k210/interrupt.c index 98cbef5401..b5384b01ee 100644 --- a/libcpu/risc-v/k210/interrupt.c +++ b/libcpu/risc-v/k210/interrupt.c @@ -335,7 +335,7 @@ uintptr_t handle_trap(uintptr_t mcause, uintptr_t epc, uintptr_t * sp) else { rt_thread_t tid; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(); #endif @@ -389,7 +389,7 @@ uintptr_t handle_trap(uintptr_t mcause, uintptr_t epc, uintptr_t * sp) print_stack_frame(sp); rt_kprintf("exception pc => 0x%08x\n", epc); rt_kprintf("current thread: %.*s\n", RT_NAME_MAX, tid->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif while(1); diff --git a/libcpu/risc-v/virt64/interrupt.c b/libcpu/risc-v/virt64/interrupt.c index 4b109d71ad..eae0a55c96 100644 --- a/libcpu/risc-v/virt64/interrupt.c +++ b/libcpu/risc-v/virt64/interrupt.c @@ -212,7 +212,7 @@ void handle_trap(rt_size_t xcause,rt_size_t xtval,rt_size_t xepc,struct rt_hw_st else { rt_thread_t tid; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern long list_thread(); #endif rt_hw_interrupt_disable(); @@ -266,7 +266,7 @@ void handle_trap(rt_size_t xcause,rt_size_t xtval,rt_size_t xepc,struct rt_hw_st dump_regs(sp); rt_kprintf("exception pc => 0x%08x\n", xepc); rt_kprintf("current thread: %.*s\n", RT_NAME_MAX, tid->name); -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif while(1); diff --git a/libcpu/rx/cpuport.c b/libcpu/rx/cpuport.c index 9f737a50e7..366569f63d 100644 --- a/libcpu/rx/cpuport.c +++ b/libcpu/rx/cpuport.c @@ -94,7 +94,7 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, return(rt_uint8_t *)stack_frame; } -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern void list_thread(void); #endif extern rt_thread_t rt_current_thread; @@ -130,7 +130,7 @@ void rt_hw_hard_fault_exception(struct stack_frame* exception_contex) rt_kprintf("acclo: 0x%08x\n", exception_contex->ACCLO); } rt_kprintf("hard fault on thread: %s\n", rt_current_thread->name); - #if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) + #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_thread(); #endif while (1); diff --git a/src/memheap.c b/src/memheap.c index 1f62c3afb0..e09f5c4bce 100644 --- a/src/memheap.c +++ b/src/memheap.c @@ -730,13 +730,13 @@ int memheaptrace(void) if (count > 0) { int index; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) extern int list_memheap(void); #endif heaps = (struct rt_memheap **)rt_malloc(sizeof(struct rt_memheap *) * count); if (heaps == RT_NULL) return 0; -#if defined(RT_USING_FINSH) && defined(FINSH_USING_BUILT_IN_COMMANDS) +#if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) list_memheap(); #endif rt_kprintf("memheap header size: %d\n", RT_MEMHEAP_SIZE);