sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/timers/arch_alarm.c: Fix alarm ISR error when no CONFIG_SCHED_TICKLESS

Browse Source 
drivers/timers/arch_alarm.c: Use uint64_t to avoid alarm 32-bit overflow
This commit is contained in:
ligd 2018-11-08 11:51:09 -06:00 committed by Gregory Nutt
parent 5223d7a391
commit 414ace8f46
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/timers/arch_alarm.c
View File

@ -79,7 +79,7 @@ static FAR struct oneshot_lowerhalf_s *g_oneshot_lower;
****************************************************************************/ ****************************************************************************/
static inline void timespec_from_usec(FAR struct timespec *ts, static inline void timespec_from_usec(FAR struct timespec *ts,
unsigned int microseconds) uint64_t microseconds)
{ {
ts->tv_sec = microseconds / USEC_PER_SEC; ts->tv_sec = microseconds / USEC_PER_SEC;
microseconds -= (uint64_t)ts->tv_sec * USEC_PER_SEC; microseconds -= (uint64_t)ts->tv_sec * USEC_PER_SEC;
@ -162,24 +162,30 @@ static void udelay_coarse(useconds_t microseconds)
} }
} }
static void oneshot_callback(FAR struct oneshot_lowerhalf_s *lower, FAR void *arg) static void oneshot_callback(FAR struct oneshot_lowerhalf_s *lower,
FAR void *arg)
{ {
#ifdef CONFIG_SCHED_TICKLESS
struct timespec now; struct timespec now;
#ifdef CONFIG_SCHED_TICKLESS
ONESHOT_CURRENT(g_oneshot_lower, &now); ONESHOT_CURRENT(g_oneshot_lower, &now);
sched_alarm_expiration(&now); sched_alarm_expiration(&now);
#else #else
struct timespec now;
struct timespec next;
struct timespec delta; struct timespec delta;
static uint64_t tick = 1;
timespec_from_usec(&next, ++tick * USEC_PER_TICK); do
ONESHOT_CURRENT(g_oneshot_lower, &now); {
clock_timespec_subtract(&next, &now, &delta); static uint64_t tick = 1;
struct timespec next;
sched_process_timer();
timespec_from_usec(&next, ++tick * USEC_PER_TICK);
ONESHOT_CURRENT(g_oneshot_lower, &now);
clock_timespec_subtract(&next, &now, &delta);
}
while (delta.tv_sec == 0 && delta.tv_nsec == 0);
ONESHOT_START(g_oneshot_lower, oneshot_callback, NULL, &delta); ONESHOT_START(g_oneshot_lower, oneshot_callback, NULL, &delta);
sched_process_timer();
#endif #endif
} }