Revert "[libc]&[dfs] remove unnecessary RT_USING_POSIX and RT_USING_DFS_DEVFS"

mysterywolf · web-flow · commit 8c01acc66789 · 2021-10-14T20:11:01.000-04:00
diff --git a/components/dfs/src/dfs.c b/components/dfs/src/dfs.c
@@ -18,7 +18,7 @@
 #include <lwp.h>
 #endif
 
-#if defined(RT_USING_DFS_DEVFS) && defined(RT_USING_LIBC)
+#if defined(RT_USING_DFS_DEVFS) && defined(RT_USING_POSIX)
 #include <libc.h>
 #endif
 
@@ -216,7 +216,7 @@ struct dfs_fd *fd_get(int fd)
     struct dfs_fd *d;
     struct dfs_fdtable *fdt;
 
-#if defined(RT_USING_DFS_DEVFS) && defined(RT_USING_LIBC)
+#if defined(RT_USING_DFS_DEVFS) && defined(RT_USING_POSIX)
     if ((0 <= fd) && (fd <= 2))
         fd = libc_stdio_get_console();
 #endif
diff --git a/components/libc/compilers/armlibc/libc.c b/components/libc/compilers/armlibc/libc.c
@@ -17,23 +17,23 @@
 
 int libc_system_init(void)
 {
-#ifdef RT_USING_DFS_DEVFS
+#if defined(RT_USING_DFS) & defined(RT_USING_DFS_DEVFS)
     rt_device_t dev_console;
 
     dev_console = rt_console_get_device();
     if (dev_console)
     {
-    #ifdef RT_USING_POSIX
+    #if defined(RT_USING_POSIX)
         libc_stdio_set_console(dev_console->parent.name, O_RDWR);
     #else
         libc_stdio_set_console(dev_console->parent.name, O_WRONLY);
-    #endif /* RT_USING_POSIX */
+    #endif
     }
-#endif /* RT_USING_DFS_DEVFS */
+#endif
 
-#if defined(RT_USING_PTHREADS) && !defined(RT_USING_COMPONENTS_INIT)
+#if defined RT_USING_PTHREADS && !defined RT_USING_COMPONENTS_INIT
     pthread_system_init();
-#endif /* defined(RT_USING_PTHREADS) && !defined(RT_USING_COMPONENTS_INIT) */
+#endif
 
     return 0;
 }
diff --git a/components/libc/compilers/armlibc/syscalls.c b/components/libc/compilers/armlibc/syscalls.c
@@ -187,14 +187,14 @@ int _sys_write(FILEHANDLE fh, const unsigned char *buf, unsigned len, int mode)
 {
 #ifdef RT_USING_DFS
     int size;
-#endif /* RT_USING_DFS */
+#endif
 
     if ((fh == STDOUT) || (fh == STDERR))
     {
 #if !defined(RT_USING_CONSOLE) || !defined(RT_USING_DEVICE)
         return 0;
 #else
-#ifdef RT_USING_DFS
+#ifdef RT_USING_POSIX
         if (libc_stdio_get_console() < 0)
         {
             LOG_W("Do not invoke standard input before initializing libc");
@@ -210,8 +210,8 @@ int _sys_write(FILEHANDLE fh, const unsigned char *buf, unsigned len, int mode)
         }
 
         return -1;
-#endif /* RT_USING_DFS */
-#endif /* !defined(RT_USING_CONSOLE) || !defined(RT_USING_DEVICE) */
+#endif
+#endif
     }
     else if (fh == STDIN)
     {
@@ -226,7 +226,7 @@ int _sys_write(FILEHANDLE fh, const unsigned char *buf, unsigned len, int mode)
         return len - size;
     else
         return -1;
-#endif /* RT_USING_DFS */
+#endif
 }
 
 /*
diff --git a/components/libc/compilers/dlib/libc.c b/components/libc/compilers/dlib/libc.c
@@ -17,23 +17,23 @@
 
 int libc_system_init(void)
 {
-#ifdef RT_USING_DFS_DEVFS
+#if defined(RT_USING_DFS) && defined(RT_USING_DFS_DEVFS)
     rt_device_t dev_console;
 
     dev_console = rt_console_get_device();
     if (dev_console)
     {
-    #ifdef RT_USING_POSIX
+    #if defined(RT_USING_POSIX)
         libc_stdio_set_console(dev_console->parent.name, O_RDWR);
     #else
         libc_stdio_set_console(dev_console->parent.name, O_WRONLY);
-    #endif /* RT_USING_POSIX */
+    #endif
     }
-#endif /* RT_USING_DFS_DEVFS */
+#endif
 
 #if defined (RT_USING_PTHREADS) && !defined (RT_USING_COMPONENTS_INIT)
     pthread_system_init();
-#endif /* defined (RT_USING_PTHREADS) && !defined (RT_USING_COMPONENTS_INIT) */
+#endif
 
     return 0;
 }
diff --git a/components/libc/compilers/dlib/syscall_write.c b/components/libc/compilers/dlib/syscall_write.c
@@ -25,15 +25,15 @@ size_t __write(int handle, const unsigned char *buf, size_t len)
 {
 #ifdef RT_USING_DFS
     int size;
-#endif /* RT_USING_DFS */
+#endif
 
     if ((handle == _LLIO_STDOUT) || (handle == _LLIO_STDERR))
     {
 #ifndef RT_USING_CONSOLE
         return _LLIO_ERROR;
 #else
 
-#ifdef RT_USING_DFS
+#ifdef RT_USING_POSIX
         if (libc_stdio_get_console() < 0)
         {
             LOG_W("Do not invoke standard output before initializing libc");
@@ -50,8 +50,8 @@ size_t __write(int handle, const unsigned char *buf, size_t len)
         }
 
         return len;
-#endif /* RT_USING_DFS */
-#endif /* RT_USING_CONSOLE */
+#endif
+#endif
     }
     else if (handle == _LLIO_STDIN)
     {
@@ -63,6 +63,6 @@ size_t __write(int handle, const unsigned char *buf, size_t len)
 #else
     size = write(handle, buf, len);
     return size;
-#endif /* RT_USING_DFS */
+#endif
 }
 
diff --git a/components/libc/compilers/gcc/newlib/libc.c b/components/libc/compilers/gcc/newlib/libc.c
@@ -23,7 +23,7 @@ int _EXFUN(putenv,(char *__string));
 
 int libc_system_init(void)
 {
-#if defined(RT_USING_DFS_DEVFS) & defined(RT_USING_CONSOLE)
+#if defined(RT_USING_DFS) & defined(RT_USING_DFS_DEVFS) & defined(RT_USING_CONSOLE)
     rt_device_t dev_console;
 
     dev_console = rt_console_get_device();
@@ -39,11 +39,11 @@ int libc_system_init(void)
     /* set PATH and HOME */
     putenv("PATH=/bin");
     putenv("HOME=/home");
-#endif /* defined(RT_USING_DFS_DEVFS) & defined(RT_USING_CONSOLE) */
+#endif
 
-#if defined(RT_USING_PTHREADS) && !defined(RT_USING_COMPONENTS_INIT)
+#if defined RT_USING_PTHREADS && !defined RT_USING_COMPONENTS_INIT
     pthread_system_init();
-#endif /* defined(RT_USING_PTHREADS) && !defined(RT_USING_COMPONENTS_INIT) */
+#endif
 
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -187,14 +187,14 @@ int _sys_write(FILEHANDLE fh, const unsigned char *buf, unsigned len, int mode)`
`187`	`187`	`{`
`188`	`188`	`#ifdef RT_USING_DFS`
`189`	`189`	`int size;`
`190`		`-#endif /* RT_USING_DFS */`
	`190`	`+#endif`
`191`	`191`
`192`	`192`	`if ((fh == STDOUT) \|\| (fh == STDERR))`
`193`	`193`	`{`
`194`	`194`	`#if !defined(RT_USING_CONSOLE) \|\| !defined(RT_USING_DEVICE)`
`195`	`195`	`return 0;`
`196`	`196`	`#else`
`197`		`-#ifdef RT_USING_DFS`
	`197`	`+#ifdef RT_USING_POSIX`
`198`	`198`	`if (libc_stdio_get_console() < 0)`
`199`	`199`	`{`
`200`	`200`	`LOG_W("Do not invoke standard input before initializing libc");`
`@@ -210,8 +210,8 @@ int _sys_write(FILEHANDLE fh, const unsigned char *buf, unsigned len, int mode)`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`return -1;`
`213`		`-#endif /* RT_USING_DFS */`
`214`		`-#endif /* !defined(RT_USING_CONSOLE) \|\| !defined(RT_USING_DEVICE) */`
	`213`	`+#endif`
	`214`	`+#endif`
`215`	`215`	`}`
`216`	`216`	`else if (fh == STDIN)`
`217`	`217`	`{`
`@@ -226,7 +226,7 @@ int _sys_write(FILEHANDLE fh, const unsigned char *buf, unsigned len, int mode)`
`226`	`226`	`return len - size;`
`227`	`227`	`else`
`228`	`228`	`return -1;`
`229`		`-#endif /* RT_USING_DFS */`
	`229`	`+#endif`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,15 @@ size_t __write(int handle, const unsigned char *buf, size_t len)`
`25`	`25`	`{`
`26`	`26`	`#ifdef RT_USING_DFS`
`27`	`27`	`int size;`
`28`		`-#endif /* RT_USING_DFS */`
	`28`	`+#endif`
`29`	`29`
`30`	`30`	`if ((handle == _LLIO_STDOUT) \|\| (handle == _LLIO_STDERR))`
`31`	`31`	`{`
`32`	`32`	`#ifndef RT_USING_CONSOLE`
`33`	`33`	`return _LLIO_ERROR;`
`34`	`34`	`#else`
`35`	`35`
`36`		`-#ifdef RT_USING_DFS`
	`36`	`+#ifdef RT_USING_POSIX`
`37`	`37`	`if (libc_stdio_get_console() < 0)`
`38`	`38`	`{`
`39`	`39`	`LOG_W("Do not invoke standard output before initializing libc");`
`@@ -50,8 +50,8 @@ size_t __write(int handle, const unsigned char *buf, size_t len)`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`return len;`
`53`		`-#endif /* RT_USING_DFS */`
`54`		`-#endif /* RT_USING_CONSOLE */`
	`53`	`+#endif`
	`54`	`+#endif`
`55`	`55`	`}`
`56`	`56`	`else if (handle == _LLIO_STDIN)`
`57`	`57`	`{`
`@@ -63,6 +63,6 @@ size_t __write(int handle, const unsigned char *buf, size_t len)`
`63`	`63`	`#else`
`64`	`64`	`size = write(handle, buf, len);`
`65`	`65`	`return size;`
`66`		`-#endif /* RT_USING_DFS */`
	`66`	`+#endif`
`67`	`67`	`}`
`68`	`68`