diff options
| author | moebius.ever <[email protected]> | 2018-03-23 17:15:35 +0800 |
|---|---|---|
| committer | moebius.ever <[email protected]> | 2018-03-23 17:15:35 +0800 |
| commit | bb93c74810b213fb4b9dafabdb145c2ec42d6a89 (patch) | |
| tree | 1646fbca44d7c46a687bdf8405fefe65ed70a9a7 /components | |
| parent | feeff73168b1e6bb3aa1a286add44af7ac940bc2 (diff) | |
| parent | 8ed3470d2a485c49ec4f5d4a5ec53e94edf7a2c8 (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'components')
| -rwxr-xr-x | components/drivers/Kconfig | 1 | ||||
| -rw-r--r-- | components/drivers/rtc/rtc.c | 2 | ||||
| -rw-r--r-- | components/drivers/usb/usbdevice/core/usbdevice.c | 2 | ||||
| -rw-r--r-- | components/libc/compilers/armlibc/sys/unistd.h | 5 |
4 files changed, 9 insertions, 1 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/drivers/usb/usbdevice/core/usbdevice.c b/components/drivers/usb/usbdevice/core/usbdevice.c index 453084990b..da46425ec4 100644 --- a/components/drivers/usb/usbdevice/core/usbdevice.c +++ b/components/drivers/usb/usbdevice/core/usbdevice.c @@ -183,7 +183,7 @@ rt_err_t rt_usb_device_init(void) #ifdef RT_USB_DEVICE_COMPOSITE rt_usbd_device_set_descriptor(udevice, &compsit_desc); rt_usbd_device_set_string(udevice, ustring); - rt_usbd_device_set_qualifier(device, &dev_qualifier); + rt_usbd_device_set_qualifier(udevice, &dev_qualifier); #else rt_usbd_device_set_descriptor(udevice, func->dev_desc); #endif 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 */ |