mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2026-09-22 19:44:24 +08:00
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user