Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-20 13:08:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

wd_start: use sclock_t type replace int

Browse source 
MIRTOS-1055

when enable SYSTEM_TIME64, tick may exceed the int32 range
example:
pthread_cond_clockwait
        ---->clock_abstime2ticks
                    ---->wd_start

Change-Id: Id6b8f9e92cbcad285c8fa684a73b7d75a8ccfebc
Signed-off-by: Jiuzhu Dong <dongjiuzhu1@xiaomi.com>
This commit is contained in:
Jiuzhu Dong 2021-09-28 22:32:11 +08:00
parent d5e4ed61ea
commit cd9f115550
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/nuttx/wdog.h
View file

@ -27,6 +27,7 @@
#include <nuttx/config.h>
#include <nuttx/clock.h>
#include <stdint.h>
#include <queue.h>
@ -69,7 +70,7 @@ struct wdog_s
#ifdef CONFIG_PIC
FAR void *picbase; /* PIC base address */
#endif
int lag; /* Timer associated with the delay */
sclock_t lag; /* Timer associated with the delay */
wdparm_t arg; /* Callback argument */
};
@ -121,7 +122,7 @@ extern "C"
*
****************************************************************************/
int wd_start(FAR struct wdog_s *wdog, int32_t delay,
int wd_start(FAR struct wdog_s *wdog, sclock_t delay,
wdentry_t wdentry, wdparm_t arg);
/****************************************************************************

4
sched/wdog/wd_start.c
View file

@ -175,13 +175,13 @@ static inline void wd_expiration(void)
*
****************************************************************************/
int wd_start(FAR struct wdog_s *wdog, int32_t delay,
int wd_start(FAR struct wdog_s *wdog, sclock_t delay,
wdentry_t wdentry, wdparm_t arg)
{
FAR struct wdog_s *curr;
FAR struct wdog_s *prev;
FAR struct wdog_s *next;
int32_t now;
sclock_t now;
irqstate_t flags;
/* Verify the wdog and setup parameters */