Merge pull request #4970 from cndabai/master

Remove C Style Command Shell

7 files changed, 148 insertions, 148 deletions

diff --git a/bsp/lm3s8962/applications/startup.c b/bsp/lm3s8962/applications/startup.c
index e78cfa7eca..87df6e8788 100644
--- a/bsp/lm3s8962/applications/startup.c
+++ b/bsp/lm3s8962/applications/startup.c
@@ -18,8 +18,8 @@
 #include "board.h"
 
 #ifdef RT_USING_LWIP
-#include <lwip/sys.h>
-#include <netif/ethernetif.h>
+    #include <lwip/sys.h>
+    #include <netif/ethernetif.h>
 #endif
 
 /**
@@ -30,8 +30,8 @@ extern void rt_hw_serial_init(void);
 
 /*@{*/
 #ifdef RT_USING_FINSH
-extern int finsh_system_init(void);
-extern void finsh_set_device(char* device);
+    extern int finsh_system_init(void);
+    extern void finsh_set_device(const char *device);
 #endif
 
 extern int rt_application_init(void);
@@ -39,11 +39,11 @@ extern void rt_hw_sdcard_init(void);
 extern int rt_hw_luminaryif_init(void);
 
 #ifdef __CC_ARM
-extern int Image$$RW_IRAM1$$ZI$$Limit;
+    extern int Image$$RW_IRAM1$$ZI$$Limit;
 #elif __ICCARM__
-#pragma section="HEAP"
+    #pragma section="HEAP"
 #else
-extern int __bss_end;
+    extern int __bss_end;
 #endif
 
 #ifdef  DEBUG
@@ -56,13 +56,13 @@ extern int __bss_end;
 * Output         : None
 * Return         : None
 *******************************************************************************/
-void assert_failed(u8* file, u32 line)
+void assert_failed(u8 *file, u32 line)
 {
-	rt_kprintf("\n\r Wrong parameter value detected on\r\n");
-	rt_kprintf("       file  %s\r\n", file);
-	rt_kprintf("       line  %d\r\n", line);
+    rt_kprintf("\n\r Wrong parameter value detected on\r\n");
+    rt_kprintf("       file  %s\r\n", file);
+    rt_kprintf("       line  %d\r\n", line);
 
-	while (1) ;
+    while (1) ;
 }
 #endif
 
@@ -71,76 +71,76 @@ void assert_failed(u8* file, u32 line)
  */
 void rtthread_startup(void)
 {
-	/* init board */
-	rt_hw_board_init();
+    /* init board */
+    rt_hw_board_init();
 
-	/* show version */
-	rt_show_version();
+    /* show version */
+    rt_show_version();
 
-	/* init timer system */
-	rt_system_timer_init();
+    /* init timer system */
+    rt_system_timer_init();
 
 #ifdef RT_USING_HEAP
 #ifdef __CC_ARM
-	rt_system_heap_init((void*)&Image$$RW_IRAM1$$ZI$$Limit, (void*)LM3S_SRAM_END);
+    rt_system_heap_init((void *)&Image$$RW_IRAM1$$ZI$$Limit, (void *)LM3S_SRAM_END);
 #elif __ICCARM__
-	rt_system_heap_init(__segment_end("HEAP"), (void*)LM3S_SRAM_END);
+    rt_system_heap_init(__segment_end("HEAP"), (void *)LM3S_SRAM_END);
 #else
-	/* init memory system */
-	rt_system_heap_init((void*)&__bss_end, (void*)LM3S_SRAM_END);
+    /* init memory system */
+    rt_system_heap_init((void *)&__bss_end, (void *)LM3S_SRAM_END);
 #endif
 #endif
 
-#ifdef RT_USING_MODULE	
-	/* init module system */
-	rt_system_module_init();
+#ifdef RT_USING_MODULE
+    /* init module system */
+    rt_system_module_init();
 #endif
 
-	/* init scheduler system */
-	rt_system_scheduler_init();
+    /* init scheduler system */
+    rt_system_scheduler_init();
 
 #ifdef RT_USING_LWIP
-	eth_system_device_init();
+    eth_system_device_init();
 
-	/* register ethernetif device */
-	rt_hw_luminaryif_init();
+    /* register ethernetif device */
+    rt_hw_luminaryif_init();
 #endif
 
-	/* init hardware serial device */
-	rt_hw_serial_init();
+    /* init hardware serial device */
+    rt_hw_serial_init();
 #ifdef RT_USING_DFS
-	/* init sd card device */
-	rt_hw_sdcard_init();
+    /* init sd card device */
+    rt_hw_sdcard_init();
 #endif
 
-	/* init application */
-	rt_application_init();
+    /* init application */
+    rt_application_init();
 
 #ifdef RT_USING_FINSH
-	/* init finsh */
-	finsh_system_init();
+    /* init finsh */
+    finsh_system_init();
 #ifdef RT_USING_DEVICE
-	finsh_set_device("uart1");
+    finsh_set_device("uart1");
 #endif
 #endif
 
-	/* init idle thread */
-	rt_thread_idle_init();
+    /* init idle thread */
+    rt_thread_idle_init();
 
-	/* start scheduler */
-	rt_system_scheduler_start();
+    /* start scheduler */
+    rt_system_scheduler_start();
 
-	/* never reach here */
-	return ;
+    /* never reach here */
+    return ;
 }
 
 int main(void)
 {
-	/* disable interrupt first */
-	rt_hw_interrupt_disable();
-	rtthread_startup();
-	
-	return 0;
+    /* disable interrupt first */
+    rt_hw_interrupt_disable();
+    rtthread_startup();
+
+    return 0;
 }
 
 /*@}*/
diff --git a/bsp/lm3s9b9x/applications/startup.c b/bsp/lm3s9b9x/applications/startup.c
index 4d374824e7..8d261d0036 100644
--- a/bsp/lm3s9b9x/applications/startup.c
+++ b/bsp/lm3s9b9x/applications/startup.c
@@ -18,8 +18,8 @@
 #include "board.h"
 
 #ifdef RT_USING_LWIP
-#include <lwip/sys.h>
-#include <netif/ethernetif.h>
+    #include <lwip/sys.h>
+    #include <netif/ethernetif.h>
 #endif
 
 /**
@@ -30,8 +30,8 @@ extern void rt_hw_serial_init(void);
 
 /*@{*/
 #ifdef RT_USING_FINSH
-extern int finsh_system_init(void);
-extern void finsh_set_device(char* device);
+    extern int finsh_system_init(void);
+    extern void finsh_set_device(const char *device);
 #endif
 
 extern int rt_application_init(void);
@@ -39,11 +39,11 @@ extern void rt_hw_sdcard_init(void);
 extern int rt_hw_luminaryif_init(void);
 
 #ifdef __CC_ARM
-extern int Image$$RW_IRAM1$$ZI$$Limit;
+    extern int Image$$RW_IRAM1$$ZI$$Limit;
 #elif __ICCARM__
-#pragma section="HEAP"
+    #pragma section="HEAP"
 #else
-extern int __bss_end;
+    extern int __bss_end;
 #endif
 
 #ifdef  DEBUG
@@ -56,13 +56,13 @@ extern int __bss_end;
 * Output         : None
 * Return         : None
 *******************************************************************************/
-void __error__(char* file, unsigned long line)
+void __error__(char *file, unsigned long line)
 {
-	rt_kprintf("\n\r Wrong parameter value detected on\r\n");
-	rt_kprintf("       file  %s\r\n", file);
-	rt_kprintf("       line  %d\r\n", line);
+    rt_kprintf("\n\r Wrong parameter value detected on\r\n");
+    rt_kprintf("       file  %s\r\n", file);
+    rt_kprintf("       line  %d\r\n", line);
 
-	while (1) ;
+    while (1) ;
 }
 #endif
 
@@ -71,77 +71,77 @@ void __error__(char* file, unsigned long line)
  */
 void rtthread_startup(void)
 {
-	/* init board */
-	rt_hw_board_init();
+    /* init board */
+    rt_hw_board_init();
 
-	/* show version */
-	rt_show_version();
+    /* show version */
+    rt_show_version();
 
-	/* init timer system */
-	rt_system_timer_init();
+    /* init timer system */
+    rt_system_timer_init();
 
 #ifdef RT_USING_HEAP
 #if LM3S_EXT_SRAM == 1
-	/* init sdram */
-	rt_system_heap_init((void*)LM3S_EXT_SRAM_BEGIN, (void*)LM3S_EXT_SRAM_END);
+    /* init sdram */
+    rt_system_heap_init((void *)LM3S_EXT_SRAM_BEGIN, (void *)LM3S_EXT_SRAM_END);
 #else
 #ifdef __CC_ARM
-	rt_system_heap_init((void*)&Image$$RW_IRAM1$$ZI$$Limit, (void*)LM3S_SRAM_END);
+    rt_system_heap_init((void *)&Image$$RW_IRAM1$$ZI$$Limit, (void *)LM3S_SRAM_END);
 #elif __ICCARM__
-	rt_system_heap_init(__segment_end("HEAP"), (void*)LM3S_SRAM_END);
+    rt_system_heap_init(__segment_end("HEAP"), (void *)LM3S_SRAM_END);
 #else
-	/* init memory system */
-	rt_system_heap_init((void*)&__bss_end, (void*)LM3S_SRAM_END);
+    /* init memory system */
+    rt_system_heap_init((void *)&__bss_end, (void *)LM3S_SRAM_END);
 #endif
 #endif
 #endif
 
-	/* init scheduler system */
-	rt_system_scheduler_init();
+    /* init scheduler system */
+    rt_system_scheduler_init();
 
 #ifdef RT_USING_LWIP
-	eth_system_device_init();
+    eth_system_device_init();
 
-	/* register ethernetif device */
-	rt_hw_luminaryif_init();
+    /* register ethernetif device */
+    rt_hw_luminaryif_init();
 #endif
 
-	/* init hardware serial device */
-	rt_hw_serial_init();
+    /* init hardware serial device */
+    rt_hw_serial_init();
 #ifdef RT_USING_DFS
-	/* init sd card device */
-	rt_hw_sdcard_init();
+    /* init sd card device */
+    rt_hw_sdcard_init();
 #endif
 
-	/* init application */
-	rt_application_init();
+    /* init application */
+    rt_application_init();
 
 #ifdef RT_USING_FINSH
-	/* init finsh */
-	finsh_system_init();
+    /* init finsh */
+    finsh_system_init();
 #ifdef RT_USING_DEVICE
-	finsh_set_device("uart1");
+    finsh_set_device("uart1");
 #endif
 #endif
 
-	/* init idle thread */
-	rt_thread_idle_init();
+    /* init idle thread */
+    rt_thread_idle_init();
 
-	/* start scheduler */
-	rt_system_scheduler_start();
+    /* start scheduler */
+    rt_system_scheduler_start();
 
-	/* never reach here */
-	return ;
+    /* never reach here */
+    return ;
 }
 
 int main(void)
 {
-	/* disable interrupt first */
+    /* disable interrupt first */
     rt_hw_interrupt_disable();
 
-	rtthread_startup();
+    rtthread_startup();
 
-	return 0;
+    return 0;
 }
 
 /*@}*/
diff --git a/bsp/lm4f232/applications/startup.c b/bsp/lm4f232/applications/startup.c
index 8d9eb54611..ed16b60a50 100644
--- a/bsp/lm4f232/applications/startup.c
+++ b/bsp/lm4f232/applications/startup.c
@@ -18,8 +18,8 @@
 #include "board.h"
 
 #ifdef RT_USING_LWIP
-#include <lwip/sys.h>
-#include <netif/ethernetif.h>
+    #include <lwip/sys.h>
+    #include <netif/ethernetif.h>
 #endif
 
 /**
@@ -30,8 +30,8 @@ extern void rt_hw_serial_init(void);
 
 /*@{*/
 #ifdef RT_USING_FINSH
-extern int finsh_system_init(void);
-extern void finsh_set_device(char* device);
+    extern int finsh_system_init(void);
+    extern void finsh_set_device(const char *device);
 #endif
 
 extern int rt_application_init(void);
@@ -39,11 +39,11 @@ extern void rt_hw_sdcard_init(void);
 extern int rt_hw_luminaryif_init(void);
 
 #ifdef __CC_ARM
-extern int Image$$ER_ZI$$ZI$$Limit;
+    extern int Image$$ER_ZI$$ZI$$Limit;
 #elif __ICCARM__
-#pragma section="HEAP"
+    #pragma section="HEAP"
 #else
-extern int __bss_end;
+    extern int __bss_end;
 #endif
 
 #ifdef  DEBUG
@@ -56,13 +56,13 @@ extern int __bss_end;
 * Output         : None
 * Return         : None
 *******************************************************************************/
-void __error__(char* file, unsigned long line)
+void __error__(char *file, unsigned long line)
 {
-	rt_kprintf("\n\r Wrong parameter value detected on\r\n");
-	rt_kprintf("       file  %s\r\n", file);
-	rt_kprintf("       line  %d\r\n", line);
+    rt_kprintf("\n\r Wrong parameter value detected on\r\n");
+    rt_kprintf("       file  %s\r\n", file);
+    rt_kprintf("       line  %d\r\n", line);
 
-	while (1) ;
+    while (1) ;
 }
 #endif
 
@@ -71,77 +71,77 @@ void __error__(char* file, unsigned long line)
  */
 void rtthread_startup(void)
 {
-	/* init board */
-	rt_hw_board_init();
+    /* init board */
+    rt_hw_board_init();
 
-	/* show version */
-	rt_show_version();
+    /* show version */
+    rt_show_version();
 
-	/* init timer system */
-	rt_system_timer_init();
+    /* init timer system */
+    rt_system_timer_init();
 
 #ifdef RT_USING_HEAP
 #if LM3S_EXT_SRAM == 1
-	/* init sdram */
-	rt_system_heap_init((void*)LM3S_EXT_SRAM_BEGIN, (void*)LM3S_EXT_SRAM_END);
+    /* init sdram */
+    rt_system_heap_init((void *)LM3S_EXT_SRAM_BEGIN, (void *)LM3S_EXT_SRAM_END);
 #else
 #ifdef __CC_ARM
-	rt_system_heap_init((void*)&Image$$ER_ZI$$ZI$$Limit, (void*)LM3S_SRAM_END);
+    rt_system_heap_init((void *)&Image$$ER_ZI$$ZI$$Limit, (void *)LM3S_SRAM_END);
 #elif __ICCARM__
-	rt_system_heap_init(__segment_end("HEAP"), (void*)LM3S_SRAM_END);
+    rt_system_heap_init(__segment_end("HEAP"), (void *)LM3S_SRAM_END);
 #else
-	/* init memory system */
-	rt_system_heap_init((void*)&__bss_end, (void*)LM3S_SRAM_END);
+    /* init memory system */
+    rt_system_heap_init((void *)&__bss_end, (void *)LM3S_SRAM_END);
 #endif
 #endif
 #endif
 
-	/* init scheduler system */
-	rt_system_scheduler_init();
+    /* init scheduler system */
+    rt_system_scheduler_init();
 
 #ifdef RT_USING_LWIP
-	eth_system_device_init();
+    eth_system_device_init();
 
-	/* register ethernetif device */
-	rt_hw_luminaryif_init();
+    /* register ethernetif device */
+    rt_hw_luminaryif_init();
 #endif
 
-	/* init hardware serial device */
-	rt_hw_serial_init();
+    /* init hardware serial device */
+    rt_hw_serial_init();
 #ifdef RT_USING_DFS
-	/* init sd card device */
-	rt_hw_sdcard_init();
+    /* init sd card device */
+    rt_hw_sdcard_init();
 #endif
 
-	/* init application */
-	rt_application_init();
+    /* init application */
+    rt_application_init();
 
 #ifdef RT_USING_FINSH
-	/* init finsh */
-	finsh_system_init();
+    /* init finsh */
+    finsh_system_init();
 #ifdef RT_USING_DEVICE
-	finsh_set_device("uart1");
+    finsh_set_device("uart1");
 #endif
 #endif
 
-	/* init idle thread */
-	rt_thread_idle_init();
+    /* init idle thread */
+    rt_thread_idle_init();
 
-	/* start scheduler */
-	rt_system_scheduler_start();
+    /* start scheduler */
+    rt_system_scheduler_start();
 
-	/* never reach here */
-	return ;
+    /* never reach here */
+    return ;
 }
 
 int main(void)
 {
-	/* disable interrupt first */
+    /* disable interrupt first */
     rt_hw_interrupt_disable();
 
-	rtthread_startup();
+    rtthread_startup();
 
-	return 0;
+    return 0;
 }
 
 /*@}*/
diff --git a/bsp/nuvoton/libraries/m031/rtt_port/drv_common.c b/bsp/nuvoton/libraries/m031/rtt_port/drv_common.c
index 65b100bbe9..35a97b5433 100644
--- a/bsp/nuvoton/libraries/m031/rtt_port/drv_common.c
+++ b/bsp/nuvoton/libraries/m031/rtt_port/drv_common.c
@@ -138,5 +138,5 @@ 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 */
diff --git a/bsp/nuvoton/libraries/m2354/rtt_port/drv_common.c b/bsp/nuvoton/libraries/m2354/rtt_port/drv_common.c
index 1dbd98f187..2209fbaba8 100644
--- a/bsp/nuvoton/libraries/m2354/rtt_port/drv_common.c
+++ b/bsp/nuvoton/libraries/m2354/rtt_port/drv_common.c
@@ -138,6 +138,6 @@ 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 */
 
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_common.c b/bsp/stm32/libraries/HAL_Drivers/drv_common.c
index 678e4ebadb..6cd9130a4a 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drv_common.c
+++ b/bsp/stm32/libraries/HAL_Drivers/drv_common.c
@@ -25,7 +25,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/w60x/drivers/board.c b/bsp/w60x/drivers/board.c
index 188c698ba9..6997392e66 100644
--- a/bsp/w60x/drivers/board.c
+++ b/bsp/w60x/drivers/board.c
@@ -255,7 +255,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 */
 
 /*@}*/