diff --git a/bsp/avr32uc3b0/startup.c b/bsp/avr32uc3b0/startup.c index efa76a4e27f11e3278447436496f946a064ba74a..920b8c790151b2a9a61e1112184325c072c9d07b 100644 --- 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(); diff --git a/bsp/bf533/startup.c b/bsp/bf533/startup.c index a56b1230352d6bd48296b3bdd0d297e658b77315..3f128b28f98486a09023005ea63571697b9a6a35 100644 --- 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(); diff --git a/bsp/efm32/startup.c b/bsp/efm32/startup.c index d769bbf99c8ebd46475ad845e176bcb09ae31ca9..02c0d949fd5e2dbd229806c7f6ad99292fbd3b05 100644 --- 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 */ diff --git a/bsp/frdm-k64f/applications/startup.c b/bsp/frdm-k64f/applications/startup.c index e558cd8cbf047fd29d6dda1304571c2e8302359c..3eb8003917f84d5a767ea235a36731bc17c2eaa4 100644 --- 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 */ diff --git a/bsp/juicevm/rtconfig.h b/bsp/juicevm/rtconfig.h index b2f2cfde3d3a0f3f6b849c85e7c4e95affa87950..b2b72b8f45b9e06cabffd5e12f4a59a2549095e1 100755 --- 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 */ diff --git a/bsp/lm3s8962/applications/startup.c b/bsp/lm3s8962/applications/startup.c index 2d8e55b55425663bac8378d533664776b2be59a5..b4e1239d100f35adaa2b4aeb4cddfa584a66625b 100644 --- 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 diff --git a/bsp/lm3s9b9x/applications/startup.c b/bsp/lm3s9b9x/applications/startup.c index 8d261d003653c2e27ecf75a5220ca097bfa6f88d..3ca6c5b348018098e45cf41fcfc712f55eaf09f0 100644 --- 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 diff --git a/bsp/lm4f232/applications/startup.c b/bsp/lm4f232/applications/startup.c index ed16b60a50e59e8060c5caf0beb2e96145934e53..8b04de0d32913645a79a9edf2304dfde13a6ad7b 100644 --- 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 diff --git a/bsp/lpc43xx/M0/applications/application.c b/bsp/lpc43xx/M0/applications/application.c index 1b14f82cd75e35f6e631249dc8043eff596e89e0..4194c039e8478068d0f37bdf87626334ea9c05ea 100644 --- 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(); diff --git a/bsp/lpc43xx/M4/applications/application.c b/bsp/lpc43xx/M4/applications/application.c index 03e56fa955e395fb863c90bd4464e433ef6ce984..a35c5862f476ed3d472e4af6bfe8420c77a13f11 100644 --- 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(); diff --git a/bsp/m16c62p/applications/startup.c b/bsp/m16c62p/applications/startup.c index 149e53089240259d72b640fef3222c348df68a69..907ec1cd207a6957318bd71ddee5fa07b84308c0 100644 --- 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 */ diff --git a/bsp/mb9bf568r/applications/application.c b/bsp/mb9bf568r/applications/application.c index e5d2b55950627ba9b8fd509aea8f869335deda99..677e9c91a589b20a559fedb30495aa9e513b1be5 100644 --- 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 */ { diff --git a/bsp/mb9bf618s/applications/application.c b/bsp/mb9bf618s/applications/application.c index 5e7c2654507066c3e09ea52a9f82066dc82d76fc..737034fff6cdc9bb6f02b0c5746963eb20578797 100644 --- 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 */ diff --git a/bsp/microblaze/startup.c b/bsp/microblaze/startup.c index e1104a4cd52f259837461965cb8d261a46a4094f..dec74de91849b709c753f797ddb00ae75bb9acd0 100755 --- 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 */ diff --git a/bsp/mini4020/applications/startup.c b/bsp/mini4020/applications/startup.c index 4d07a8edd70112087c585b05de981df69b06fee3..0feba225cfa210789978e1bc4fb50693ab0fd398 100644 --- 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 diff --git a/bsp/nios_ii/startup.c b/bsp/nios_ii/startup.c index fd2f909aa215ab34845fcfc59c3a252da4f4fe96..aa6df54c3abb983399ee8ba6c62320a031ebdbe5 100644 --- 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 */ diff --git a/bsp/nv32f100x/app/src/main.c b/bsp/nv32f100x/app/src/main.c index 813878bc9f51420685baf74240fc3db444ef73b2..4145900aa37dbefa276cc7e0f46f16e41d710fdf 100644 --- 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 */ diff --git a/bsp/pic32ethernet/startup.c b/bsp/pic32ethernet/startup.c index 372440d711784d6d112fd32e22f281fc25fdf977..8c8772a4a78e825752414d731feba0991e8c9eb8 100644 --- 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 diff --git a/bsp/rm48x50/application/startup.c b/bsp/rm48x50/application/startup.c index a49c9f18102b2a7fc2c109635d934b0dd4d8b81a..cbcc9b19caee535e601285cfc14bba3a762304c9 100644 --- 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 */ diff --git a/bsp/rx/applications/application.c b/bsp/rx/applications/application.c index 2013a3c69a1749ddb4736a3ffeecd4c166d799c8..eb3053174bacb8140163e427512af050ab0398c0 100644 --- 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 */ diff --git a/bsp/sam7x/applications/startup.c b/bsp/sam7x/applications/startup.c index 528d6127f3a5c665e542afdbd840fc27cfd17eaf..bc3e8f5ad3f88aa1b3646a86975fce9423713c15 100644 --- 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 */ diff --git a/bsp/samd21/applications/application.c b/bsp/samd21/applications/application.c index d311cb23fc75a05733783f47771fe8bf8f047a87..6bb3c7d24e73c25805f934b35c8d5a975232bd28 100644 --- 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(); diff --git a/bsp/sep6200/application/startup.c b/bsp/sep6200/application/startup.c index 0d67f0825616cd39a54cfa247899d1535f236f59..4ecacf560fa0733a4e7c1aab8f878b172172fe57 100644 --- 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 diff --git a/bsp/taihu/applications/startup.c b/bsp/taihu/applications/startup.c index 299a2867e638eecec03115e8f925164f3d964a90..7812af03aa8c6989145268317607c405a3a52e59 100644 --- 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 */ diff --git a/bsp/upd70f3454/applications/startup.c b/bsp/upd70f3454/applications/startup.c index 9a9ed22cde1c413a1b9bb5fe1060fdcc2831b864..990112dfa82d37d163d4f4a5809224a3df404ae1 100644 --- 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 */ diff --git a/bsp/xplorer4330/applications/application.c b/bsp/xplorer4330/applications/application.c index 707be03de8c7b4b33c4f76fbdad0167937a5979d..98f1874c0d2f717f720700a2959d3bc01ca2e061 100644 --- 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) diff --git a/components/finsh/finsh.h b/components/finsh/finsh.h index f5e4df9e493bb195c638efb4d37c822d47ad7acf..865627fd79d6454e24a538cfa98e86d5b767e412 100644 --- 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 diff --git a/components/finsh/shell.h b/components/finsh/shell.h index ca1ec308edaf7f25b9de1cc2d9e4dceaf36dad75..0c20ba60dd2e4e3a5fe1ea14593975732230b4b6 100644 --- 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);