diff options
| author | ZYH <[email protected]> | 2018-03-23 14:52:07 +0800 |
|---|---|---|
| committer | ZYH <[email protected]> | 2018-03-23 14:52:07 +0800 |
| commit | 93060f2478a4c0a3dc3320ff65cffdd6d3566177 (patch) | |
| tree | 66c145421fb5f92ca04c4179909d066be1de7f88 /components | |
| parent | 0fcf08ae881fe0e64029b8a83858dc789d003b5c (diff) | |
| parent | e8ee150d1e65baae56cdaa38f9799ad94b056311 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'components')
| -rwxr-xr-x | components/drivers/Kconfig | 1 | ||||
| -rw-r--r-- | components/drivers/rtc/rtc.c | 2 | ||||
| -rw-r--r-- | components/libc/compilers/armlibc/sys/unistd.h | 5 | ||||
| -rw-r--r-- | components/libc/compilers/dlib/fcntl.h | 0 | ||||
| -rw-r--r-- | components/libc/compilers/dlib/sys/stat.h | 0 | ||||
| -rw-r--r-- | components/libc/compilers/dlib/sys/unistd.h | 5 |
6 files changed, 13 insertions, 0 deletions
diff --git a/components/drivers/Kconfig b/components/drivers/Kconfig index 90ad1c940f..fc02b0eaed 100755 --- a/components/drivers/Kconfig +++ b/components/drivers/Kconfig @@ -90,6 +90,7 @@ config RT_USING_RTC default n config RTC_SYNC_USING_NTP bool "Using NTP auto sync RTC time" + select PKG_USING_NETUTILS select PKG_NETUTILS_NTP default n diff --git a/components/drivers/rtc/rtc.c b/components/drivers/rtc/rtc.c index a33e1dfccf..f64a528ef0 100644 --- a/components/drivers/rtc/rtc.c +++ b/components/drivers/rtc/rtc.c @@ -225,6 +225,8 @@ int rt_rtc_ntp_sync_init(void) } init_ok = RT_TRUE; + + return RT_EOK; } INIT_COMPONENT_EXPORT(rt_rtc_ntp_sync_init); #endif /* RTC_SYNC_USING_NTP */ diff --git a/components/libc/compilers/armlibc/sys/unistd.h b/components/libc/compilers/armlibc/sys/unistd.h index 38ba8b5072..56979955ba 100644 --- a/components/libc/compilers/armlibc/sys/unistd.h +++ b/components/libc/compilers/armlibc/sys/unistd.h @@ -4,6 +4,11 @@ #include <rtthread.h> #ifdef RT_USING_DFS + +#define STDIN_FILENO 0 /* standard input file descriptor */ +#define STDOUT_FILENO 1 /* standard output file descriptor */ +#define STDERR_FILENO 2 /* standard error file descriptor */ + #include <dfs_posix.h> #else #define _FREAD 0x0001 /* read enabled */ diff --git a/components/libc/compilers/dlib/fcntl.h b/components/libc/compilers/dlib/fcntl.h new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/components/libc/compilers/dlib/fcntl.h diff --git a/components/libc/compilers/dlib/sys/stat.h b/components/libc/compilers/dlib/sys/stat.h new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/components/libc/compilers/dlib/sys/stat.h diff --git a/components/libc/compilers/dlib/sys/unistd.h b/components/libc/compilers/dlib/sys/unistd.h index 06a46746c0..dbe4f3010d 100644 --- a/components/libc/compilers/dlib/sys/unistd.h +++ b/components/libc/compilers/dlib/sys/unistd.h @@ -2,6 +2,11 @@ #define _SYS_UNISTD_H #ifdef RT_USING_DFS + +#define STDIN_FILENO 0 /* standard input file descriptor */ +#define STDOUT_FILENO 1 /* standard output file descriptor */ +#define STDERR_FILENO 2 /* standard error file descriptor */ + #include <dfs_posix.h> #else #define _FREAD 0x0001 /* read enabled */ |