Merge pull request #5320 from mysterywolf/pse-master

[POSIX] move PSE branch to master

16 files changed, 114 insertions, 110 deletions

diff --git a/components/libc/Kconfig b/components/libc/Kconfig
index 94793be569..69f8e1ae36 100644
--- a/components/libc/Kconfig
+++ b/components/libc/Kconfig
@@ -1,8 +1,7 @@
 menu "POSIX layer and C standard library"
 
 config RT_USING_LIBC
-    bool "Enable libc APIs from toolchain"
-    select RT_USING_HEAP
+    bool "Enable libc APIs from the toolchain"
     default n
 
 if RT_USING_LIBC
@@ -10,9 +9,9 @@ if RT_USING_LIBC
         default y
 
     config RT_LIBC_USING_FILEIO
-        bool "Enable libc with file operation, eg.fopen/fwrite/fread/getchar"
-        select RT_USING_POSIX
-        select RT_USING_POSIX_STDIO
+        bool "Enable libc with file operation, eg.fopen/fwrite/fread/getchar/STDIO"
+        select RT_USING_POSIX_FS
+        select RT_USING_POSIX_DEVIO
         default n
 
     config RT_USING_MODULE
@@ -38,59 +37,6 @@ config RT_LIBC_DEFAULT_TIMEZONE
     range -12 12
     default 8
 
-config RT_USING_POSIX
-    bool "Enable basic POSIX layer, open()/read()/write()/close() etc"
-    select RT_USING_DFS
-    default n
-
-if RT_USING_POSIX
-    config RT_USING_POSIX_STDIO
-        bool "Enable standard I/O, STDOUT_FILENO/STDIN_FILENO/STDERR_FILENO"
-        select RT_USING_DFS
-        select RT_USING_DFS_DEVFS
-        default n
-
-    config RT_USING_POSIX_POLL
-        bool "Enable poll()"
-        select RT_USING_DFS
-        default n
-
-    config RT_USING_POSIX_SELECT
-        bool "Enable select()"
-        select RT_USING_DFS
-        select RT_USING_POSIX_POLL
-        default n
-
-    config RT_USING_POSIX_DELAY
-        bool "Enable delay APIs, sleep()/usleep()/msleep() etc"
-        default n
-
-    config RT_USING_POSIX_GETLINE
-        bool "Enable getline()/getdelim()"
-        default n
-
-    config RT_USING_POSIX_MMAP
-        bool "Enable mmap()"
-        select RT_USING_DFS
-        default n
-
-    config RT_USING_POSIX_TERMIOS
-        bool "Enable termios APIs"
-        default n
-
-    config RT_USING_POSIX_AIO
-        bool "Enable AIO APIs"
-        default n
-endif
-
-config RT_USING_PTHREADS
-    bool "Enable pthreads APIs"
-    default n
-
-if RT_USING_PTHREADS
-    config PTHREAD_NUM_MAX
-        int "Maximum number of pthreads"
-        default 8
-endif
+source "$RTT_DIR/components/libc/posix/Kconfig"
 
 endmenu
diff --git a/components/libc/compilers/armlibc/syscalls.c b/components/libc/compilers/armlibc/syscalls.c
index 71eacb1c41..0e965d62af 100644
--- a/components/libc/compilers/armlibc/syscalls.c
+++ b/components/libc/compilers/armlibc/syscalls.c
@@ -21,9 +21,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#ifdef RT_USING_POSIX_STDIO
+#ifdef RT_USING_POSIX_DEVIO
 #include "libc.h"
-#endif
+#endif /* RT_USING_POSIX_DEVIO */
 
 #define DBG_TAG    "armlibc.syscalls"
 #define DBG_LVL    DBG_INFO
@@ -149,29 +149,33 @@ int _sys_read(FILEHANDLE fh, unsigned char *buf, unsigned len, int mode)
 
     if (fh == STDIN)
     {
-#ifdef RT_USING_POSIX_STDIO
+#ifdef RT_USING_POSIX_DEVIO
         if (libc_stdio_get_console() < 0)
         {
             LOG_W("Do not invoke standard output before initializing libc");
             return 0; /* error, but keep going */
         }
         size = read(STDIN_FILENO, buf, len);
-        return 0; /* success */
+        return len - size; /* success */
 #else
         return 0; /* error */
-#endif
+#endif /* RT_USING_POSIX_DEVIO */
     }
     else if (fh == STDOUT || fh == STDERR)
     {
-        return 0; /* error */
+        return -1; /* 100% error */
     }
     else
     {
         size = read(fh, buf, len);
         if (size >= 0)
+        {
             return len - size; /* success */
+        }
         else
+        {
             return 0; /* error */
+        }
     }
 #else
     return 0; /* error */
@@ -209,16 +213,20 @@ int _sys_write(FILEHANDLE fh, const unsigned char *buf, unsigned len, int mode)
     }
     else if (fh == STDIN)
     {
-        return 0; /* error */
+        return -1; /* 100% error */
     }
     else
     {
 #ifdef DFS_USING_POSIX
         size = write(fh, buf, len);
         if (size >= 0)
-            return 0; /* success */
+        {
+            return len - size; /* success */
+        }
         else
+        {
             return 0; /* error */
+        }
 #else
         return 0; /* error */
 #endif /* DFS_USING_POSIX */
@@ -332,7 +340,7 @@ int fputc(int c, FILE *f)
 
 int fgetc(FILE *f)
 {
-#ifdef RT_USING_POSIX_STDIO
+#ifdef RT_USING_POSIX_DEVIO
     char ch;
 
     if (libc_stdio_get_console() < 0)
@@ -343,7 +351,7 @@ int fgetc(FILE *f)
 
     if(read(STDIN_FILENO, &ch, 1) == 1)
         return ch;
-#endif /* RT_USING_POSIX_STDIO */
+#endif /* RT_USING_POSIX_DEVIO */
     return 0; /* error */
 }
 
diff --git a/components/libc/compilers/common/sys/ioctl.h b/components/libc/compilers/common/sys/ioctl.h
index 04f73837bc..29ed3a8b84 100644
--- a/components/libc/compilers/common/sys/ioctl.h
+++ b/components/libc/compilers/common/sys/ioctl.h
@@ -11,9 +11,7 @@
 #define _SYS_IOCTL_H
 
 #include <rtconfig.h>
-#ifdef RT_USING_POSIX
 #include <dfs_posix.h>
-#endif
 
 #ifdef _WIN32
 #include <winsock.h>
diff --git a/components/libc/compilers/common/sys/time.h b/components/libc/compilers/common/sys/time.h
index d14905ebfb..93e3bb7ba4 100644
--- a/components/libc/compilers/common/sys/time.h
+++ b/components/libc/compilers/common/sys/time.h
@@ -72,7 +72,6 @@ int settimeofday(const struct timeval *tv, const struct timezone *tz);
 struct tm *gmtime_r(const time_t *timep, struct tm *r);
 #endif
 
-#ifdef RT_USING_POSIX
 /* POSIX clock and timer */
 #define MILLISECOND_PER_SECOND  1000UL
 #define MICROSECOND_PER_SECOND  1000000UL
@@ -103,8 +102,8 @@ int clock_getres  (clockid_t clockid, struct timespec *res);
 int clock_gettime (clockid_t clockid, struct timespec *tp);
 int clock_settime (clockid_t clockid, const struct timespec *tp);
 int rt_timespec_to_tick(const struct timespec *time);
-#endif /* RT_USING_POSIX */
 
+/* timezone */
 void tz_set(int8_t tz);
 int8_t tz_get(void);
 int8_t tz_is_dst(void);
diff --git a/components/libc/compilers/common/time.c b/components/libc/compilers/common/time.c
index 5bfff15914..73b6d76352 100644
--- a/components/libc/compilers/common/time.c
+++ b/components/libc/compilers/common/time.c
@@ -486,8 +486,6 @@ RTM_EXPORT(settimeofday);
 RTM_EXPORT(difftime);
 RTM_EXPORT(strftime);
 
-#ifdef RT_USING_POSIX
-
 #ifdef RT_USING_RTC
 static volatile struct timeval _timevalue;
 static int _rt_clock_time_system_init()
@@ -690,9 +688,6 @@ int rt_timespec_to_tick(const struct timespec *time)
 }
 RTM_EXPORT(rt_timespec_to_tick);
 
-#endif /* RT_USING_POSIX */
-
-
 /* timezone */
 #ifndef RT_LIBC_DEFAULT_TIMEZONE
 #define RT_LIBC_DEFAULT_TIMEZONE    8
diff --git a/components/libc/compilers/dlib/syscall_read.c b/components/libc/compilers/dlib/syscall_read.c
index 469ea7c1dd..62bc05d243 100644
--- a/components/libc/compilers/dlib/syscall_read.c
+++ b/components/libc/compilers/dlib/syscall_read.c
@@ -11,9 +11,9 @@
 #include <rtthread.h>
 #include <LowLevelIOInterface.h>
 #include <unistd.h>
-#ifdef RT_USING_POSIX_STDIO
+#ifdef RT_USING_POSIX_DEVIO
 #include "libc.h"
-#endif
+#endif /* RT_USING_POSIX_DEVIO */
 
 #define DBG_TAG    "dlib.syscall_read"
 #define DBG_LVL    DBG_INFO
@@ -39,7 +39,7 @@ size_t __read(int handle, unsigned char *buf, size_t len)
 
     if (handle == _LLIO_STDIN)
     {
-#ifdef RT_USING_POSIX_STDIO
+#ifdef RT_USING_POSIX_DEVIO
         if (libc_stdio_get_console() < 0)
         {
             LOG_W("Do not invoke standard input before initializing libc");
@@ -48,7 +48,7 @@ size_t __read(int handle, unsigned char *buf, size_t len)
         return read(STDIN_FILENO, buf, len); /* return the length of the data read */
 #else
         return _LLIO_ERROR;
-#endif /* RT_USING_POSIX_STDIO */
+#endif /* RT_USING_POSIX_DEVIO */
     }
     else if ((handle == _LLIO_STDOUT) || (handle == _LLIO_STDERR))
     {
diff --git a/components/libc/compilers/dlib/syscall_write.c b/components/libc/compilers/dlib/syscall_write.c
index d5ede3e59e..2bc5863d8a 100644
--- a/components/libc/compilers/dlib/syscall_write.c
+++ b/components/libc/compilers/dlib/syscall_write.c
@@ -11,10 +11,6 @@
 #include <rtthread.h>
 #include <LowLevelIOInterface.h>
 #include <unistd.h>
-#ifdef RT_USING_POSIX_STDIO
-#include "libc.h"
-#endif
-
 #define DBG_TAG    "dlib.syscall_write"
 #define DBG_LVL    DBG_INFO
 #include <rtdbg.h>
diff --git a/components/libc/compilers/gcc/newlib/syscalls.c b/components/libc/compilers/gcc/newlib/syscalls.c
index 8bb9af940d..8fe8c5be4b 100644
--- a/components/libc/compilers/gcc/newlib/syscalls.c
+++ b/components/libc/compilers/gcc/newlib/syscalls.c
@@ -20,12 +20,12 @@
 #include <unistd.h>
 #include <sys/errno.h>
 #include <sys/stat.h>
-#ifdef RT_USING_POSIX_STDIO
+#ifdef RT_USING_POSIX_DEVIO
 #include "libc.h"
-#endif
+#endif /* RT_USING_POSIX_DEVIO */
 #ifdef RT_USING_MODULE
 #include <dlmodule.h>
-#endif
+#endif /* RT_USING_MODULE */
 
 #define DBG_TAG    "newlib.syscalls"
 #define DBG_LVL    DBG_INFO
@@ -225,7 +225,7 @@ _ssize_t _read_r(struct _reent *ptr, int fd, void *buf, size_t nbytes)
     _ssize_t rc;
     if (fd == STDIN_FILENO)
     {
-#ifdef RT_USING_POSIX_STDIO
+#ifdef RT_USING_POSIX_DEVIO
         if (libc_stdio_get_console() < 0)
         {
             LOG_W("Do not invoke standard input before initializing libc");
@@ -234,7 +234,7 @@ _ssize_t _read_r(struct _reent *ptr, int fd, void *buf, size_t nbytes)
 #else
         ptr->_errno = ENOTSUP;
         return -1;
-#endif /* RT_USING_POSIX_STDIO */
+#endif /* RT_USING_POSIX_DEVIO */
     }
     else if (fd == STDOUT_FILENO || fd == STDERR_FILENO)
     {
diff --git a/components/libc/posix/Kconfig b/components/libc/posix/Kconfig
new file mode 100644
index 0000000000..0afff161ff
--- /dev/null
+++ b/components/libc/posix/Kconfig
@@ -0,0 +1,58 @@
+menu "POSIX (Portable Operating System Interface) layer"
+
+config RT_USING_POSIX_FS
+    bool "Enable POSIX file system, open()/read()/write()/close() etc"
+    select RT_USING_DFS
+    select DFS_USING_POSIX
+    default n
+
+if RT_USING_POSIX_FS
+    config RT_USING_POSIX_DEVIO
+        bool "Enable devices as file descriptors"
+        select RT_USING_DFS_DEVFS
+        default n
+
+    config RT_USING_POSIX_POLL
+        bool "Enable poll()"
+        default n
+
+    config RT_USING_POSIX_SELECT
+        bool "Enable select()"
+        select RT_USING_POSIX_POLL
+        default n
+endif
+
+config RT_USING_POSIX_DELAY
+    bool "Enable delay APIs, sleep()/usleep()/msleep() etc"
+    default n
+
+config RT_USING_POSIX_GETLINE
+    bool "Enable getline()/getdelim()"
+    select RT_USING_LIBC
+    select RT_LIBC_USING_FILEIO
+    default n
+
+config RT_USING_POSIX_MMAP
+    bool "Enable mmap()"
+    select RT_USING_POSIX_FS
+    default n
+
+config RT_USING_POSIX_TERMIOS
+    bool "Enable termios APIs"
+    default n
+
+config RT_USING_POSIX_AIO
+    bool "Enable AIO APIs"
+    default n
+
+config RT_USING_PTHREADS
+    bool "Enable pthreads APIs"
+    default n
+
+if RT_USING_PTHREADS
+    config PTHREAD_NUM_MAX
+        int "Maximum number of pthreads"
+        default 8
+endif
+
+endmenu
diff --git a/components/libc/posix/aio/SConscript b/components/libc/posix/aio/SConscript
index 445efaade5..139bc45749 100644
--- a/components/libc/posix/aio/SConscript
+++ b/components/libc/posix/aio/SConscript
@@ -6,6 +6,6 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c')
 CPPPATH = [cwd]
 
-group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX', 'RT_USING_POSIX_AIO'], CPPPATH = CPPPATH)
+group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_AIO'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/libc/posix/getline/SConscript b/components/libc/posix/getline/SConscript
index bb18dc04c5..a0077b0ce9 100644
--- a/components/libc/posix/getline/SConscript
+++ b/components/libc/posix/getline/SConscript
@@ -3,11 +3,9 @@
 from building import *
 
 cwd = GetCurrentDir()
-src = Glob('*.c') + Glob('*.cpp')
+src = Glob('*.c')
 CPPPATH = [cwd]
 
-group = DefineGroup('POSIX', src,
-    depend = ['RT_USING_LIBC', 'RT_USING_POSIX','RT_USING_POSIX_GETLINE'], 
-    CPPPATH = CPPPATH)
+group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX_GETLINE'], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/libc/posix/getline/posix_getline.c b/components/libc/posix/getline/posix_getline.c
index da80242ecc..63fa33ea42 100644
--- a/components/libc/posix/getline/posix_getline.c
+++ b/components/libc/posix/getline/posix_getline.c
@@ -75,4 +75,3 @@ ssize_t getdelim(char **lineptr, size_t *n, int delim, FILE *stream) {
 ssize_t getline(char **lineptr, size_t *n, FILE *stream) {
     return getdelim(lineptr, n, '\n', stream);
 }
-
diff --git a/components/libc/posix/src/SConscript b/components/libc/posix/src/SConscript
index 78a2a933ed..4be5ac83cc 100644
--- a/components/libc/posix/src/SConscript
+++ b/components/libc/posix/src/SConscript
@@ -2,25 +2,35 @@
 
 from building import *
 
-src     = ['unistd.c']
+src     = []
 cwd     = GetCurrentDir()
 CPPPATH = [cwd]
+group   = []
 
-if GetDepend('RT_USING_POSIX_STDIO'):
+flag = False
+src += ['unistd.c'] #TODO
+
+if GetDepend('RT_USING_POSIX_DEVIO'):
     src += ['libc.c']
+    flag = True
 
 if GetDepend('RT_USING_POSIX_DELAY'):
     src += ['delay.c']
+    flag = True
 
 if GetDepend('RT_USING_POSIX_POLL'):
     src += ['poll.c']
+    flag = True
 
 if GetDepend('RT_USING_POSIX_SELECT'):
     src += ['select.c']
+    flag = True
 
 if GetDepend('RT_USING_POSIX_MMAP'):
     src += ['mmap.c']
+    flag = True
 
-group = DefineGroup('POSIX', src, depend = ['RT_USING_POSIX'], CPPPATH = CPPPATH)
+if flag == True:
+    group = DefineGroup('POSIX', src, depend = [], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/components/libc/posix/src/libc.c b/components/libc/posix/src/libc.c
index 068719d5d6..c324d84ef8 100644
--- a/components/libc/posix/src/libc.c
+++ b/components/libc/posix/src/libc.c
@@ -23,7 +23,7 @@
 
 int libc_system_init(void)
 {
-#ifdef RT_USING_POSIX
+#ifdef RT_USING_POSIX_DEVIO
     rt_device_t dev_console;
 
     dev_console = rt_console_get_device();
@@ -31,7 +31,7 @@ int libc_system_init(void)
     {
         libc_stdio_set_console(dev_console->parent.name, O_RDWR);
     }
-#endif /* RT_USING_POSIX */
+#endif /* RT_USING_POSIX_DEVIO */
 
 #if defined RT_USING_PTHREADS && !defined RT_USING_COMPONENTS_INIT
     pthread_system_init();
@@ -41,8 +41,7 @@ int libc_system_init(void)
 }
 INIT_COMPONENT_EXPORT(libc_system_init);
 
-#ifdef RT_USING_POSIX
-
+#ifdef RT_USING_POSIX_DEVIO
 #if defined(RT_USING_LIBC) && defined(RT_USING_NEWLIB)
 #define STDIO_DEVICE_NAME_MAX   32
 static FILE* std_console = NULL;
@@ -145,4 +144,4 @@ int libc_stdio_get_console(void) {
     return std_fd;
 }
 #endif /* defined(RT_USING_LIBC) && defined(RT_USING_NEWLIB) */
-#endif /* RT_USING_POSIX */
+#endif /* RT_USING_POSIX_DEVIO */
diff --git a/components/libc/posix/src/libc.h b/components/libc/posix/src/libc.h
index f81380bf78..b019267926 100644
--- a/components/libc/posix/src/libc.h
+++ b/components/libc/posix/src/libc.h
@@ -17,10 +17,10 @@ extern "C" {
 #endif
 
 int libc_system_init(void);
-#ifdef RT_USING_POSIX
+#ifdef RT_USING_POSIX_DEVIO
 int libc_stdio_get_console(void);
 int libc_stdio_set_console(const char* device_name, int mode);
-#endif /* RT_USING_POSIX */
+#endif /* RT_USING_POSIX_DEVIO */
 
 #ifdef __cplusplus
 }
diff --git a/components/libc/posix/termios/SConscript b/components/libc/posix/termios/SConscript
index bd9a528461..3615926251 100644
--- a/components/libc/posix/termios/SConscript
+++ b/components/libc/posix/termios/SConscript
@@ -6,8 +6,6 @@ cwd = GetCurrentDir()
 src = Glob('*.c') + Glob('*.cpp')
 CPPPATH = [cwd]
 
-group = DefineGroup('POSIX', src, 
-    depend = ['RT_USING_LIBC', 'RT_USING_POSIX', 'RT_USING_POSIX_TERMIOS'], 
-    CPPPATH = CPPPATH)
+group = DefineGroup('POSIX', src, depend = ['RT_USING_LIBC', 'RT_USING_POSIX_TERMIOS'], CPPPATH = CPPPATH)
 
 Return('group')