libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-22 01:05:20 +08:00
Code Issues Releases Wiki Activity

🐞 fix(soft_rtc): fix unsupported TIMEVAL and GET_TIMERES (#8011)

Browse Source
This commit is contained in:
xqyjlj 2023-09-23 14:07:00 +08:00 committed by GitHub
parent dc84765823
commit 047cc8663e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
components/drivers/rtc/soft_rtc.c
View File

@ -40,10 +40,10 @@ static rt_device_t source_device = RT_NULL;
static struct rt_device soft_rtc_dev; static struct rt_device soft_rtc_dev;
static rt_tick_t init_tick; static rt_tick_t init_tick;
static time_t init_time; static time_t init_time;
static struct timeval init_tv = {0};
#ifdef RT_USING_KTIME #ifdef RT_USING_KTIME
static struct timeval init_tv = {0}; static struct timespec init_ts = {0};
static struct timespec init_ts = {0};
#endif #endif
#ifdef RT_USING_ALARM #ifdef RT_USING_ALARM
@ -97,12 +97,6 @@ static void _source_device_control(int cmd, void *args)
static rt_err_t soft_rtc_control(rt_device_t dev, int cmd, void *args) static rt_err_t soft_rtc_control(rt_device_t dev, int cmd, void *args)
{ {
time_t *t; time_t *t;
#ifdef RT_USING_KTIME
struct timeval *tv;
struct timespec *ts;
struct timeval _tv;
struct timespec _ts;
#endif
struct tm time_temp; struct tm time_temp;
RT_ASSERT(dev != RT_NULL); RT_ASSERT(dev != RT_NULL);
@ -111,9 +105,11 @@ static rt_err_t soft_rtc_control(rt_device_t dev, int cmd, void *args)
switch (cmd) switch (cmd)
{ {
case RT_DEVICE_CTRL_RTC_GET_TIME: case RT_DEVICE_CTRL_RTC_GET_TIME:
{
t = (time_t *) args; t = (time_t *) args;
*t = init_time + (rt_tick_get() - init_tick) / RT_TICK_PER_SECOND; *t = init_time + (rt_tick_get() - init_tick) / RT_TICK_PER_SECOND;
break; break;
}
case RT_DEVICE_CTRL_RTC_SET_TIME: case RT_DEVICE_CTRL_RTC_SET_TIME:
{ {
t = (time_t *) args; t = (time_t *) args;
@ -132,37 +128,76 @@ static rt_err_t soft_rtc_control(rt_device_t dev, int cmd, void *args)
#endif #endif
#ifdef RT_USING_KTIME #ifdef RT_USING_KTIME
case RT_DEVICE_CTRL_RTC_GET_TIMEVAL: case RT_DEVICE_CTRL_RTC_GET_TIMEVAL:
tv = (struct timeval *)args; {
struct timeval _tv;
struct timeval *tv = (struct timeval *)args;
rt_ktime_boottime_get_us(&_tv); rt_ktime_boottime_get_us(&_tv);
tv->tv_sec = init_time + _tv.tv_sec; tv->tv_sec = init_time + _tv.tv_sec;
tv->tv_usec = init_tv.tv_usec + _tv.tv_usec; tv->tv_usec = init_tv.tv_usec + _tv.tv_usec;
break; break;
}
case RT_DEVICE_CTRL_RTC_SET_TIMEVAL: case RT_DEVICE_CTRL_RTC_SET_TIMEVAL:
tv = (struct timeval *)args; {
struct timeval _tv;
struct timeval *tv = (struct timeval *)args;
rt_ktime_boottime_get_us(&_tv); rt_ktime_boottime_get_us(&_tv);
set_rtc_time(tv->tv_sec); set_rtc_time(tv->tv_sec);
init_tv.tv_usec = tv->tv_usec - _tv.tv_usec; init_tv.tv_usec = tv->tv_usec - _tv.tv_usec;
_source_device_control(RT_DEVICE_CTRL_RTC_SET_TIME, &(tv->tv_sec)); _source_device_control(RT_DEVICE_CTRL_RTC_SET_TIME, &(tv->tv_sec));
break; break;
}
case RT_DEVICE_CTRL_RTC_GET_TIMESPEC: case RT_DEVICE_CTRL_RTC_GET_TIMESPEC:
ts = (struct timespec *)args; {
struct timespec _ts;
struct timespec *ts = (struct timespec *)args;
rt_ktime_boottime_get_ns(&_ts); rt_ktime_boottime_get_ns(&_ts);
ts->tv_sec = init_time + _ts.tv_sec; ts->tv_sec = init_time + _ts.tv_sec;
ts->tv_nsec = init_ts.tv_nsec + _ts.tv_nsec; ts->tv_nsec = init_ts.tv_nsec + _ts.tv_nsec;
break; break;
}
case RT_DEVICE_CTRL_RTC_SET_TIMESPEC: case RT_DEVICE_CTRL_RTC_SET_TIMESPEC:
ts = (struct timespec *)args; {
struct timespec _ts;
struct timespec *ts = (struct timespec *)args;
rt_ktime_boottime_get_ns(&_ts); rt_ktime_boottime_get_ns(&_ts);
set_rtc_time(ts->tv_sec); set_rtc_time(ts->tv_sec);
init_ts.tv_nsec = ts->tv_nsec - _ts.tv_nsec; init_ts.tv_nsec = ts->tv_nsec - _ts.tv_nsec;
_source_device_control(RT_DEVICE_CTRL_RTC_SET_TIME, &(ts->tv_sec)); _source_device_control(RT_DEVICE_CTRL_RTC_SET_TIME, &(ts->tv_sec));
break; break;
}
case RT_DEVICE_CTRL_RTC_GET_TIMERES: case RT_DEVICE_CTRL_RTC_GET_TIMERES:
ts = (struct timespec *)args; {
struct timespec *ts = (struct timespec *)args;
ts->tv_sec = 0; ts->tv_sec = 0;
ts->tv_nsec = (rt_ktime_cputimer_getres() / RT_KTIME_RESMUL); ts->tv_nsec = (rt_ktime_cputimer_getres() / RT_KTIME_RESMUL);
break; break;
#endif }
#else
case RT_DEVICE_CTRL_RTC_GET_TIMEVAL:
{
struct timeval *tv = (struct timeval *)args;
rt_tick_t tick = rt_tick_get() - init_tick;
tv->tv_sec = init_time + tick / RT_TICK_PER_SECOND;
tv->tv_usec = init_tv.tv_usec + ((tick % RT_TICK_PER_SECOND) * (1000000 / RT_TICK_PER_SECOND));
break;
}
case RT_DEVICE_CTRL_RTC_SET_TIMEVAL:
{
struct timeval *tv = (struct timeval *)args;
rt_tick_t tick = rt_tick_get() - init_tick;
set_rtc_time(tv->tv_sec);
init_tv.tv_usec = tv->tv_usec - ((tick % RT_TICK_PER_SECOND) * (1000000 / RT_TICK_PER_SECOND));
_source_device_control(RT_DEVICE_CTRL_RTC_SET_TIME, &(tv->tv_sec));
break;
}
case RT_DEVICE_CTRL_RTC_GET_TIMERES:
{
struct timespec *ts = (struct timespec *)args;
ts->tv_sec = 0;
ts->tv_nsec = (1000UL * 1000 * 1000) / RT_TICK_PER_SECOND;
break;
}
#endif /* RT_USING_KTIME */
default: default:
return -RT_EINVAL; return -RT_EINVAL;
} }