Merge pull request #5014 from mysterywolf/finsh

[finsh] 修复由于移除finsh导致__cmd_xxx命令无法使用的问题

18 files changed, 26 insertions, 46 deletions

diff --git a/bsp/at91sam9260/platform/interrupt.c b/bsp/at91sam9260/platform/interrupt.c
index 7c40ffbdad..dc98fe7c4d 100644
--- a/bsp/at91sam9260/platform/interrupt.c
+++ b/bsp/at91sam9260/platform/interrupt.c
@@ -413,7 +413,6 @@ void list_irq(void)
 }
 
 #include <finsh.h>
-FINSH_FUNCTION_EXPORT(list_irq, list system irq);
 
 #ifdef FINSH_USING_MSH
 int cmd_list_irq(int argc, char** argv)
@@ -421,8 +420,7 @@ int cmd_list_irq(int argc, char** argv)
     list_irq();
     return 0;
 }
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_list_irq, __cmd_list_irq, list system irq.);
-
+MSH_CMD_EXPORT_ALIAS(cmd_list_irq, list_irq, list system irq);
 #endif
 #endif
 #endif
diff --git a/bsp/at91sam9260/platform/reset.c b/bsp/at91sam9260/platform/reset.c
index 4b5462a9e1..6679ab57fe 100644
--- a/bsp/at91sam9260/platform/reset.c
+++ b/bsp/at91sam9260/platform/reset.c
@@ -38,15 +38,14 @@ int cmd_reset(int argc, char** argv)
     rt_hw_cpu_reset();
     return 0;
 }
+MSH_CMD_EXPORT_ALIAS(cmd_reset, reset, restart the system);
 
 int cmd_shutdown(int argc, char** argv)
 {
     rt_hw_cpu_shutdown();
     return 0;
 }
-
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_reset, __cmd_reset, restart the system.);
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_shutdown, __cmd_shutdown, shutdown the system.);
+MSH_CMD_EXPORT_ALIAS(cmd_shutdown, shutdown, shutdown the system);
 
 #endif
 #endif
diff --git a/bsp/at91sam9g45/platform/interrupt.c b/bsp/at91sam9g45/platform/interrupt.c
index c8afc998f1..c3dd99e798 100644
--- a/bsp/at91sam9g45/platform/interrupt.c
+++ b/bsp/at91sam9g45/platform/interrupt.c
@@ -445,7 +445,6 @@ void list_irq(void)
 }
 
 #include <finsh.h>
-FINSH_FUNCTION_EXPORT(list_irq, list system irq);
 
 #ifdef FINSH_USING_MSH
 int cmd_list_irq(int argc, char** argv)
@@ -453,8 +452,7 @@ int cmd_list_irq(int argc, char** argv)
     list_irq();
     return 0;
 }
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_list_irq, __cmd_list_irq, list system irq.);
-
+MSH_CMD_EXPORT_ALIAS(cmd_list_irq, list_irq, list system irq);
 #endif
 #endif
 #endif
diff --git a/bsp/at91sam9g45/platform/reset.c b/bsp/at91sam9g45/platform/reset.c
index 8abbf7a9fb..33d6f97283 100644
--- a/bsp/at91sam9g45/platform/reset.c
+++ b/bsp/at91sam9g45/platform/reset.c
@@ -30,7 +30,6 @@ void machine_shutdown(void)
 #ifdef RT_USING_FINSH
 
 #include <finsh.h>
-FINSH_FUNCTION_EXPORT_ALIAS(rt_hw_cpu_reset, reset, restart the system);
 
 #ifdef FINSH_USING_MSH
 int cmd_reset(int argc, char** argv)
@@ -38,15 +37,14 @@ int cmd_reset(int argc, char** argv)
     rt_hw_cpu_reset();
     return 0;
 }
+MSH_CMD_EXPORT_ALIAS(cmd_reset, reset, restart the system);
 
 int cmd_shutdown(int argc, char** argv)
 {
     rt_hw_cpu_shutdown();
     return 0;
 }
-
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_reset, __cmd_reset, restart the system.);
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_shutdown, __cmd_shutdown, shutdown the system.);
+MSH_CMD_EXPORT_ALIAS(cmd_shutdown, shutdown, shutdown the system);
 
 #endif
 #endif
diff --git a/bsp/beaglebone/applications/board.c b/bsp/beaglebone/applications/board.c
index ff25dd7dd7..e1e1f8cae2 100644
--- a/bsp/beaglebone/applications/board.c
+++ b/bsp/beaglebone/applications/board.c
@@ -163,5 +163,4 @@ void rt_hw_cpu_reset(void)
     REG32(PRM_DEVICE(prcm_base)) = 0x1;
     RT_ASSERT(0);
 }
-FINSH_FUNCTION_EXPORT_ALIAS(rt_hw_cpu_reset, reboot, reboot the cpu);
-FINSH_FUNCTION_EXPORT_ALIAS(rt_hw_cpu_reset, __cmd_reboot, reboot the cpu);
+MSH_CMD_EXPORT_ALIAS(rt_hw_cpu_reset, reboot, reboot the cpu);
diff --git a/bsp/dm365/drivers/davinci_emac.c b/bsp/dm365/drivers/davinci_emac.c
index 7ad539fb09..b164bf7aaa 100644
--- a/bsp/dm365/drivers/davinci_emac.c
+++ b/bsp/dm365/drivers/davinci_emac.c
@@ -1751,7 +1751,7 @@ int cmd_dump_emac_stats(int argc, char** argv)
     dump_emac_stats();
     return 0;
 }
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_dump_emac_stats, __cmd_dump_emac_stats, dump emac statistics.);
+MSH_CMD_EXPORT_ALIAS(cmd_dump_emac_stats, dump_emac_stats, dump emac statistics);
 #endif
 
 #endif
diff --git a/bsp/dm365/platform/interrupt.c b/bsp/dm365/platform/interrupt.c
index 6334072bcd..fb0d4d3d3e 100644
--- a/bsp/dm365/platform/interrupt.c
+++ b/bsp/dm365/platform/interrupt.c
@@ -286,8 +286,7 @@ int cmd_list_irq(int argc, char** argv)
     list_irq();
     return 0;
 }
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_list_irq, __cmd_list_irq, list system irq.);
-
+MSH_CMD_EXPORT_ALIAS(cmd_list_irq, list_irq, list system irq);
 #endif
 #endif
 #endif
diff --git a/bsp/dm365/platform/reset.c b/bsp/dm365/platform/reset.c
index dc80fac76e..b706e5a4cc 100644
--- a/bsp/dm365/platform/reset.c
+++ b/bsp/dm365/platform/reset.c
@@ -39,7 +39,6 @@ void machine_shutdown()
 #ifdef RT_USING_FINSH
 
 #include <finsh.h>
-FINSH_FUNCTION_EXPORT_ALIAS(rt_hw_cpu_reset, reset, restart the system);
 
 #ifdef FINSH_USING_MSH
 int cmd_reset(int argc, char** argv)
@@ -47,15 +46,14 @@ int cmd_reset(int argc, char** argv)
     rt_hw_cpu_reset();
     return 0;
 }
+MSH_CMD_EXPORT_ALIAS(cmd_reset, reset, restart the system);
 
 int cmd_shutdown(int argc, char** argv)
 {
     rt_hw_cpu_shutdown();
     return 0;
 }
-
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_reset, __cmd_reset, restart the system.);
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_shutdown, __cmd_shutdown, shutdown the system.);
+MSH_CMD_EXPORT_ALIAS(cmd_shutdown, shutdown, shutdown the system);
 
 #endif
 #endif
diff --git a/bsp/fm33lc026/libraries/HAL_Drivers/drv_common.c b/bsp/fm33lc026/libraries/HAL_Drivers/drv_common.c
index 9decb78d6d..27eb76cc84 100644
--- a/bsp/fm33lc026/libraries/HAL_Drivers/drv_common.c
+++ b/bsp/fm33lc026/libraries/HAL_Drivers/drv_common.c
@@ -22,7 +22,7 @@ static void reboot(uint8_t argc, char **argv)
 {
     rt_hw_cpu_reset();
 }
-FINSH_FUNCTION_EXPORT_ALIAS(reboot, __cmd_reboot, Reboot System);
+MSH_CMD_EXPORT(reboot, reboot system);
 #endif /* RT_USING_FINSH */
 
 /* SysTick configuration */
diff --git a/bsp/hk32/hk32f030c8-mini/board/board.c b/bsp/hk32/hk32f030c8-mini/board/board.c
index e659a2f718..8d3aeaf117 100644
--- a/bsp/hk32/hk32f030c8-mini/board/board.c
+++ b/bsp/hk32/hk32f030c8-mini/board/board.c
@@ -21,7 +21,7 @@ static void reboot(uint8_t argc, char **argv)
 {
     rt_hw_cpu_reset();
 }
-FINSH_FUNCTION_EXPORT_ALIAS(reboot, __cmd_reboot, Reboot System);
+MSH_CMD_EXPORT(reboot, reboot system);
 #endif /* RT_USING_FINSH */
 
 /** System Clock Configuration
diff --git a/bsp/mb9bf506r/drivers/nand.c b/bsp/mb9bf506r/drivers/nand.c
index fcd8cf42d4..1c03120d14 100644
--- a/bsp/mb9bf506r/drivers/nand.c
+++ b/bsp/mb9bf506r/drivers/nand.c
@@ -646,7 +646,7 @@ void nand_readoob(int block, int page)
 }
 FINSH_FUNCTION_EXPORT_ALIAS(nand_readoob, readoob, read oob[block/page]);
 
-void nand_erase_chip()
+void nand_erase_chip(void)
 {
     int i;
     unsigned char id;
diff --git a/bsp/nuvoton/libraries/n9h30/rtt_port/drv_sys.c b/bsp/nuvoton/libraries/n9h30/rtt_port/drv_sys.c
index 43b0c2cfb8..6bd1e90c6d 100644
--- a/bsp/nuvoton/libraries/n9h30/rtt_port/drv_sys.c
+++ b/bsp/nuvoton/libraries/n9h30/rtt_port/drv_sys.c
@@ -271,7 +271,6 @@ E_SYS_USB0_ID nu_sys_usb0_role(void)
 #ifdef RT_USING_FINSH
 
 #include <finsh.h>
-FINSH_FUNCTION_EXPORT_ALIAS(rt_hw_cpu_reset, reset, restart the system);
 
 #ifdef FINSH_USING_MSH
 int cmd_reset(int argc, char **argv)
@@ -279,15 +278,14 @@ int cmd_reset(int argc, char **argv)
     rt_hw_cpu_reset();
     return 0;
 }
+MSH_CMD_EXPORT_ALIAS(cmd_reset, reset, restart the system);
 
 int cmd_shutdown(int argc, char **argv)
 {
     rt_hw_cpu_shutdown();
     return 0;
 }
-
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_reset, __cmd_reset, restart the system.);
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_shutdown, __cmd_shutdown, shutdown the system.);
+MSH_CMD_EXPORT_ALIAS(cmd_shutdown, shutdown, shutdown the system);
 
 int nu_clocks(int argc, char **argv)
 {
diff --git a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_sys.c b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_sys.c
index c19d2dd34a..8d4538576b 100644
--- a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_sys.c
+++ b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_sys.c
@@ -310,15 +310,14 @@ int cmd_reset(int argc, char **argv)
     rt_hw_cpu_reset();
     return 0;
 }
+MSH_CMD_EXPORT_ALIAS(cmd_reset, reset, restart the system);
 
 int cmd_shutdown(int argc, char **argv)
 {
     rt_hw_cpu_shutdown();
     return 0;
 }
-
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_reset, __cmd_reset, restart the system.);
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_shutdown, __cmd_shutdown, shutdown the system.);
+MSH_CMD_EXPORT_ALIAS(cmd_shutdown, shutdown, shutdown the system);
 
 int nu_clocks(int argc, char **argv)
 {
@@ -345,7 +344,7 @@ int nu_clocks(int argc, char **argv)
 
     return 0;
 }
-MSH_CMD_EXPORT(nu_clocks, Get all system clocks);
+MSH_CMD_EXPORT(nu_clocks, get all system clocks);
 #endif
 
 #ifdef RT_USING_INTERRUPT_INFO
diff --git a/bsp/nv32f100x/board/src/board.c b/bsp/nv32f100x/board/src/board.c
index 372099a6ba..75da79f9ee 100644
--- a/bsp/nv32f100x/board/src/board.c
+++ b/bsp/nv32f100x/board/src/board.c
@@ -98,21 +98,14 @@ void rt_hw_board_init()
 #ifdef RT_USING_HEAP
     rt_system_heap_init((void*)NV32_SRAM_BEGIN, (void*)NV32_SRAM_END);
 #endif
-
-
-
-
 }
 
-long cmd_reset(int argc, char** argv)
+int cmd_reset(int argc, char** argv)
 {
     NVIC_SystemReset();
 
     return 0;
 }
-
-FINSH_FUNCTION_EXPORT_ALIAS(cmd_reset, __cmd_reset, Reset Board.);
-
-
+MSH_CMD_EXPORT_ALIAS(cmd_reset, reset, restart the system);
 
 /*@}*/
diff --git a/bsp/qemu-vexpress-a9/drivers/audio/drv_ac97.c b/bsp/qemu-vexpress-a9/drivers/audio/drv_ac97.c
index cf88ebed5e..d8ab4eda8a 100644
--- a/bsp/qemu-vexpress-a9/drivers/audio/drv_ac97.c
+++ b/bsp/qemu-vexpress-a9/drivers/audio/drv_ac97.c
@@ -102,6 +102,6 @@ int _ac97_reg_dump(int argc, char **argv)
     AC97_DUMP(AC97_ADC_SLOT_MAP);
     return 0;
 }
-FINSH_FUNCTION_EXPORT_ALIAS(_ac97_reg_dump, __cmd_ac97_dump, ac97 dump reg.);
+MSH_CMD_EXPORT_ALIAS(_ac97_reg_dump, ac97_dump, ac97 dump reg);
 
 #endif
diff --git a/bsp/qemu-vexpress-a9/drivers/audio/drv_pl041.c b/bsp/qemu-vexpress-a9/drivers/audio/drv_pl041.c
index 3498031d7b..9de431ed9b 100644
--- a/bsp/qemu-vexpress-a9/drivers/audio/drv_pl041.c
+++ b/bsp/qemu-vexpress-a9/drivers/audio/drv_pl041.c
@@ -391,5 +391,6 @@ int _aaci_pl041_reg_dump(int argc, char **argv)
     PL041_DUMP(PL041->dr4[0]);
     return 0;
 }
-FINSH_FUNCTION_EXPORT_ALIAS(_aaci_pl041_reg_dump, __cmd_pl041_dump, aaci pl041 dump reg.);
+MSH_CMD_EXPORT_ALIAS(_aaci_pl041_reg_dump, pl041_dump, aaci pl041 dump reg);
+
 #endif
diff --git a/bsp/simulator/drivers/board.c b/bsp/simulator/drivers/board.c
index 4facdfa1b2..17339d4e1a 100755
--- a/bsp/simulator/drivers/board.c
+++ b/bsp/simulator/drivers/board.c
@@ -84,7 +84,7 @@ void rt_hw_exit(void)
 #if defined(RT_USING_FINSH)
 #include <finsh.h>
 FINSH_FUNCTION_EXPORT_ALIAS(rt_hw_exit, exit, exit rt - thread);
-FINSH_FUNCTION_EXPORT_ALIAS(rt_hw_exit, __cmd_quit, exit rt-thread);
+MSH_CMD_EXPORT_ALIAS(rt_hw_exit, quit, exit rt-thread);
 #endif /* RT_USING_FINSH */
 
 /**
diff --git a/bsp/w60x/drivers/drv_standby.c b/bsp/w60x/drivers/drv_standby.c
index dfe699bf32..8e35f4cca8 100644
--- a/bsp/w60x/drivers/drv_standby.c
+++ b/bsp/w60x/drivers/drv_standby.c
@@ -97,7 +97,7 @@ static void standby(uint8_t argc, char **argv)
         sys_start_standby(atoi(argv[1]));
     }
 }
-FINSH_FUNCTION_EXPORT_ALIAS(standby, __cmd_standby, sleep System);
+MSH_CMD_EXPORT(standby, sleep system);
 #endif /* RT_USING_FINSH */
 
 #endif /* BSP_USING_STANDBY */