Skip to content

Commit 4e9744c

Browse files
GuozhanxinGuozhanxin
authored
Merge pull request #5302 from mysterywolf/posix
[PSE分支] 新增 RT_USING_POSIX_DEVIO
2 parents 3bc5ffb + 7c789d4 commit 4e9744c

File tree

51 files changed

+112
-99
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+112
-99
lines changed

‎bsp/avr32uc3b0/startup.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ int main(void)
3838
#ifdef RT_USING_FINSH
3939
/* init finsh */
4040
finsh_system_init();
41+
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
4142
finsh_set_device(FINSH_DEVICE_NAME);
43+
#endif
4244
#endif
4345

4446
rt_thread_idle_init();

‎bsp/bf533/startup.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ void rtthread_startup(void)
6262
/* init finsh */
6363
extern int finsh_system_init(void);
6464
finsh_system_init();
65+
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
6566
finsh_set_device("uart0");
67+
#endif
6668
#endif
6769

6870
rt_system_timer_thread_init();

‎bsp/efm32/startup.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ void rtthread_startup(void)
111111
/* init finsh */
112112
#ifdef RT_USING_FINSH
113113
finsh_system_init();
114+
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
114115
finsh_set_device(CONSOLE_DEVICE);
116+
#endif
115117
#endif
116118

117119
/* Initialize gui server */

‎bsp/frdm-k64f/applications/startup.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ void rtthread_startup(void)
7979
#ifdef RT_USING_FINSH
8080
/* init finsh */
8181
finsh_system_init();
82+
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
8283
finsh_set_device( FINSH_DEVICE_NAME );
84+
#endif
8385
#endif
8486

8587
/* init timer thread */

‎bsp/juicevm/rtconfig.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
/* POSIX layer and C standard library */
107107

108108
#define RT_USING_LIBC
109-
// #define RT_USING_POSIX
110109

111110
/* Network */
112111

‎bsp/lm3s8962/applications/startup.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void rtthread_startup(void)
119119
#ifdef RT_USING_FINSH
120120
/* init finsh */
121121
finsh_system_init();
122-
#if !defined(RT_USING_POSIX) && defined(RT_USING_DEVICE)
122+
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
123123
finsh_set_device("uart1");
124124
#endif
125125
#endif

‎bsp/lm3s9b9x/applications/startup.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void rtthread_startup(void)
119119
#ifdef RT_USING_FINSH
120120
/* init finsh */
121121
finsh_system_init();
122-
#ifdef RT_USING_DEVICE
122+
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
123123
finsh_set_device("uart1");
124124
#endif
125125
#endif

‎bsp/lm4f232/applications/startup.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void rtthread_startup(void)
119119
#ifdef RT_USING_FINSH
120120
/* init finsh */
121121
finsh_system_init();
122-
#ifdef RT_USING_DEVICE
122+
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
123123
finsh_set_device("uart1");
124124
#endif
125125
#endif

‎bsp/lpc43xx/M0/applications/application.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ void rt_init_thread_entry(void *parameter)
2828
#ifdef RT_USING_FINSH
2929
/* initialize finsh */
3030
finsh_system_init();
31+
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
3132
finsh_set_device(RT_CONSOLE_DEVICE_NAME);
3233
#endif
34+
#endif
3335

3436
#ifdef RT_USING_VBUS
3537
rt_vbus_do_init();

‎bsp/lpc43xx/M4/applications/application.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ void rt_init_thread_entry(void *parameter)
5959
#ifdef RT_USING_FINSH
6060
/* initialize finsh */
6161
finsh_system_init();
62+
#if !defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DEVICE)
6263
finsh_set_device(RT_CONSOLE_DEVICE_NAME);
6364
#endif
65+
#endif
6466

6567
#ifdef RT_USING_VBUS
6668
rt_vbus_do_init();

0 commit comments

Comments
 (0)