对finsh_set_device调用增加宏定义限制

2021-11-24 08:57:12 -05:00 · 2021-11-24 08:57:12 -05:00 · bd80b7a4a1
parent a3284876ff
commit bd80b7a4a1
28 changed files with 47 additions and 12 deletions
--- a/bsp/avr32uc3b0/startup.c
+++ b/bsp/avr32uc3b0/startup.c
@ -38,7 +38,9 @@ int main(void)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device(FINSH_DEVICE_NAME);
+#endif
 #endif

    rt_thread_idle_init();
--- a/bsp/bf533/startup.c
+++ b/bsp/bf533/startup.c
@ -62,7 +62,9 @@ void rtthread_startup(void)
    /* init finsh */
    extern int finsh_system_init(void);
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart0");
+#endif
 #endif

    rt_system_timer_thread_init();
--- a/bsp/efm32/startup.c
+++ b/bsp/efm32/startup.c
@ -111,7 +111,9 @@ void rtthread_startup(void)
    /* init finsh */
 #ifdef RT_USING_FINSH
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device(CONSOLE_DEVICE);
+#endif
 #endif

    /* Initialize gui server */
--- a/bsp/frdm-k64f/applications/startup.c
+++ b/bsp/frdm-k64f/applications/startup.c
@ -79,7 +79,9 @@ void rtthread_startup(void)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device( FINSH_DEVICE_NAME );
+#endif
 #endif

    /* init timer thread */
--- a/bsp/juicevm/rtconfig.h
+++ b/bsp/juicevm/rtconfig.h
@ -106,7 +106,6 @@
 /* POSIX layer and C standard library */

 #define RT_USING_LIBC
-// #define RT_USING_POSIX

 /* Network */

--- a/bsp/lm3s8962/applications/startup.c
+++ b/bsp/lm3s8962/applications/startup.c
@ -119,7 +119,7 @@ void rtthread_startup(void)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
-#if !defined(RT_USING_POSIX) && defined(RT_USING_DEVICE)
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart1");
 #endif
 #endif
--- a/bsp/lm3s9b9x/applications/startup.c
+++ b/bsp/lm3s9b9x/applications/startup.c
@ -119,7 +119,7 @@ void rtthread_startup(void)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
-#ifdef RT_USING_DEVICE
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart1");
 #endif
 #endif
--- a/bsp/lm4f232/applications/startup.c
+++ b/bsp/lm4f232/applications/startup.c
@ -119,7 +119,7 @@ void rtthread_startup(void)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
-#ifdef RT_USING_DEVICE
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart1");
 #endif
 #endif
--- a/bsp/lpc43xx/M0/applications/application.c
+++ b/bsp/lpc43xx/M0/applications/application.c
@ -28,8 +28,10 @@ void rt_init_thread_entry(void *parameter)
 #ifdef RT_USING_FINSH
    /* initialize finsh */
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device(RT_CONSOLE_DEVICE_NAME);
 #endif
+#endif

 #ifdef RT_USING_VBUS
    rt_vbus_do_init();
--- a/bsp/lpc43xx/M4/applications/application.c
+++ b/bsp/lpc43xx/M4/applications/application.c
@ -59,8 +59,10 @@ void rt_init_thread_entry(void *parameter)
 #ifdef RT_USING_FINSH
    /* initialize finsh */
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device(RT_CONSOLE_DEVICE_NAME);
 #endif
+#endif

 #ifdef RT_USING_VBUS
    rt_vbus_do_init();
--- a/bsp/m16c62p/applications/startup.c
+++ b/bsp/m16c62p/applications/startup.c
@ -65,7 +65,9 @@ void rtthread_startup(void)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart0");
+#endif
 #endif

    /* init timer thread */
--- a/bsp/mb9bf568r/applications/application.c
+++ b/bsp/mb9bf568r/applications/application.c
@ -25,8 +25,9 @@ void rt_init_thread_entry(void *parameter)


    //finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device(RT_CONSOLE_DEVICE_NAME);
-
+#endif

    /**< init led device */
    {
--- a/bsp/mb9bf618s/applications/application.c
+++ b/bsp/mb9bf618s/applications/application.c
@ -24,7 +24,7 @@ void rt_init_thread_entry(void *parameter)
 #endif

 #ifdef  RT_USING_FINSH
-    finsh_set_device(RT_CONSOLE_DEVICE_NAME);
+    (RT_CONSOLE_DEVICE_NAME);
 #endif  /* RT_USING_FINSH */

    /**< init led device */
--- a/bsp/microblaze/startup.c
+++ b/bsp/microblaze/startup.c
@ -84,7 +84,9 @@ void rtthread_startup(void)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart1");
+#endif
 #endif

    /* init idle thread */
--- a/bsp/mini4020/applications/startup.c
+++ b/bsp/mini4020/applications/startup.c
@ -77,7 +77,7 @@ void rtthread_startup()
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
-#ifdef RT_USING_DEVICE
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart0");
 #endif
 #endif
--- a/bsp/nios_ii/startup.c
+++ b/bsp/nios_ii/startup.c
@ -60,7 +60,9 @@ void rtthread_startup(void)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart");
+#endif
 #endif

    /* init idle thread */
--- a/bsp/nv32f100x/app/src/main.c
+++ b/bsp/nv32f100x/app/src/main.c
@ -17,8 +17,10 @@ int main(void)
 {
    rt_thread_t thread;

-#ifdef  RT_USING_FINSH
+#ifdef RT_USING_FINSH
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device(RT_CONSOLE_DEVICE_NAME);
+#endif
 #endif

    /* Create led thread */
--- a/bsp/pic32ethernet/startup.c
+++ b/bsp/pic32ethernet/startup.c
@ -48,7 +48,7 @@ void rtthread_startup(void)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
-#ifdef RT_USING_DEVICE
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart1");
 #endif
 #endif
--- a/bsp/rm48x50/application/startup.c
+++ b/bsp/rm48x50/application/startup.c
@ -104,7 +104,9 @@ void rtthread_startup(void)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("sci2");
+#endif
 #endif

    /* init soft timer thread */
--- a/bsp/rx/applications/application.c
+++ b/bsp/rx/applications/application.c
@ -60,8 +60,10 @@ void rt_init_thread_entry(void* parameter)
 #ifdef RT_USING_FINSH
 	/* initialize finsh */
 	finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
 	finsh_set_device(RT_CONSOLE_DEVICE_NAME);
 #endif
+#endif

 #ifdef RT_USING_LWIP
 	/* initialize lwip stack */
@ -130,7 +132,9 @@ void rt_init_thread_entry(void* parameter)
 #endif

 #ifdef  RT_USING_FINSH
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device(RT_CONSOLE_DEVICE_NAME);
+#endif
 #endif  /* RT_USING_FINSH */

    /* Filesystem Initialization */
--- a/bsp/sam7x/applications/startup.c
+++ b/bsp/sam7x/applications/startup.c
@ -114,7 +114,9 @@ void rtthread_startup(void)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart1");
+#endif
 #endif

    /* init idle thread */
--- a/bsp/samd21/applications/application.c
+++ b/bsp/samd21/applications/application.c
@ -87,7 +87,9 @@ void rt_init_thread_entry(void* parameter)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart1");
+#endif
 #endif

    LED_Init();
--- a/bsp/sep6200/application/startup.c
+++ b/bsp/sep6200/application/startup.c
@ -64,7 +64,7 @@ void rtthread_startup()
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
-#ifdef RT_USING_DEVICE
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart0");
 #endif
 #endif
--- a/bsp/taihu/applications/startup.c
+++ b/bsp/taihu/applications/startup.c
@ -53,7 +53,9 @@ void rtthread_startup(void)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart1");
+#endif
 #endif

    /* init soft timer thread */
--- a/bsp/upd70f3454/applications/startup.c
+++ b/bsp/upd70f3454/applications/startup.c
@ -64,7 +64,9 @@ void rtthread_startup(void)
 #ifdef RT_USING_FINSH
    /* init finsh */
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device("uart0");
+#endif
 #endif

    /* init timer thread */
--- a/bsp/xplorer4330/applications/application.c
+++ b/bsp/xplorer4330/applications/application.c
@ -23,8 +23,10 @@ void rt_init_thread_entry(void *parameter)
 #ifdef RT_USING_FINSH
    /* initialize finsh */
    finsh_system_init();
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
    finsh_set_device(RT_CONSOLE_DEVICE_NAME);
 #endif
+#endif
 }
 /*the led thread*/
 ALIGN(RT_ALIGN_SIZE)
--- a/components/finsh/finsh.h
+++ b/components/finsh/finsh.h
@ -168,7 +168,7 @@ extern struct finsh_syscall *_syscall_table_begin, *_syscall_table_end;
 /* find out system call, which should be implemented in user program */
 struct finsh_syscall *finsh_syscall_lookup(const char *name);

-#ifdef RT_USING_DEVICE
+#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
 void finsh_set_device(const char *device_name);
 #endif

--- a/components/finsh/shell.h
+++ b/components/finsh/shell.h
@ -91,7 +91,6 @@ void finsh_set_echo(rt_uint32_t echo);
 rt_uint32_t finsh_get_echo(void);

 int finsh_system_init(void);
-void finsh_set_device(const char *device_name);
 const char *finsh_get_device(void);
 int finsh_getchar(void);