diff --git a/include/nuttx/wdog.h b/include/nuttx/wdog.h index 47fce235600..c3ac6b18bc4 100644 --- a/include/nuttx/wdog.h +++ b/include/nuttx/wdog.h @@ -138,7 +138,7 @@ int wd_start(FAR struct wdog_s *wdog, sclock_t delay, wdentry_t wdentry, wdparm_t arg); /**************************************************************************** - * Name: wd_start_absolute + * Name: wd_start_abstick * * Description: * This function adds a watchdog timer to the active timer queue. The @@ -173,8 +173,8 @@ int wd_start(FAR struct wdog_s *wdog, sclock_t delay, * ****************************************************************************/ -int wd_start_absolute(FAR struct wdog_s *wdog, clock_t ticks, - wdentry_t wdentry, wdparm_t arg); +int wd_start_abstick(FAR struct wdog_s *wdog, clock_t ticks, + wdentry_t wdentry, wdparm_t arg); /**************************************************************************** * Name: wd_cancel diff --git a/sched/timer/timer_settime.c b/sched/timer/timer_settime.c index dd08d129560..04937c2404e 100644 --- a/sched/timer/timer_settime.c +++ b/sched/timer/timer_settime.c @@ -120,8 +120,8 @@ static inline void timer_restart(FAR struct posix_timer_s *timer, timer->pt_overrun++; } - wd_start_absolute(&timer->pt_wdog, timer->pt_expected, - timer_timeout, itimer); + wd_start_abstick(&timer->pt_wdog, timer->pt_expected, + timer_timeout, itimer); } } @@ -322,8 +322,8 @@ int timer_settime(timer_t timerid, int flags, /* Then start the watchdog */ - ret = wd_start_absolute(&timer->pt_wdog, timer->pt_expected, - timer_timeout, (wdparm_t)timer); + ret = wd_start_abstick(&timer->pt_wdog, timer->pt_expected, + timer_timeout, (wdparm_t)timer); if (ret < 0) { diff --git a/sched/wdog/wd_start.c b/sched/wdog/wd_start.c index 4d5c964eaa5..fd703e6c976 100644 --- a/sched/wdog/wd_start.c +++ b/sched/wdog/wd_start.c @@ -212,7 +212,7 @@ void wd_insert(FAR struct wdog_s *wdog, clock_t expired, ****************************************************************************/ /**************************************************************************** - * Name: wd_start_absolute + * Name: wd_start_abstick * * Description: * This function adds a watchdog timer to the active timer queue. The @@ -247,8 +247,8 @@ void wd_insert(FAR struct wdog_s *wdog, clock_t expired, * ****************************************************************************/ -int wd_start_absolute(FAR struct wdog_s *wdog, clock_t ticks, - wdentry_t wdentry, wdparm_t arg) +int wd_start_abstick(FAR struct wdog_s *wdog, clock_t ticks, + wdentry_t wdentry, wdparm_t arg) { irqstate_t flags; bool reassess = false; @@ -278,7 +278,7 @@ int wd_start_absolute(FAR struct wdog_s *wdog, clock_t ticks, ticks++; /* NOTE: There is a race condition here... the caller may receive - * the watchdog between the time that wd_start_absolute is called and + * the watchdog between the time that wd_start_abstick is called and * the critical section is established. */ @@ -368,8 +368,8 @@ int wd_start(FAR struct wdog_s *wdog, sclock_t delay, return -EINVAL; } - return wd_start_absolute(wdog, clock_systime_ticks() + delay, - wdentry, arg); + return wd_start_abstick(wdog, clock_systime_ticks() + delay, + wdentry, arg); } /****************************************************************************