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

stm32f7 tickless: Fix handling of overflow for different width timers.

Browse Source
This commit is contained in:
Anthony Merlino 2021-04-10 20:04:37 -04:00 committed by Xiang Xiao
parent f979dd72c1
commit 2aa2b7669f
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/src/stm32f7/stm32_tickless.c
View File

@ -401,8 +401,13 @@ static int stm32_tickless_handler(int irq, void *context, void *arg)
static uint64_t stm32_get_counter(void) static uint64_t stm32_get_counter(void)
{ {
#ifdef HAVE_32BIT_TICKLESS
return ((uint64_t)g_tickless.overflow << 32) | return ((uint64_t)g_tickless.overflow << 32) |
STM32_TIM_GETCOUNTER(g_tickless.tch); STM32_TIM_GETCOUNTER(g_tickless.tch);
#else
return ((uint64_t)g_tickless.overflow << 16) |
STM32_TIM_GETCOUNTER(g_tickless.tch);
#endif
} }
/**************************************************************************** /****************************************************************************
@ -1060,8 +1065,13 @@ int up_alarm_start(FAR const struct timespec *ts)
int up_alarm_cancel(FAR struct timespec *ts) int up_alarm_cancel(FAR struct timespec *ts)
{ {
#ifdef HAVE_32BIT_TICKLESS
uint64_t nsecs = (((uint64_t)g_tickless.overflow << 32) | uint64_t nsecs = (((uint64_t)g_tickless.overflow << 32) |
STM32_TIM_GETCOUNTER(g_tickless.tch)) * NSEC_PER_TICK; STM32_TIM_GETCOUNTER(g_tickless.tch)) * NSEC_PER_TICK;
#else
uint64_t nsecs = (((uint64_t)g_tickless.overflow << 16) |
STM32_TIM_GETCOUNTER(g_tickless.tch)) * NSEC_PER_TICK;
#endif
ts->tv_sec = nsecs / NSEC_PER_SEC; ts->tv_sec = nsecs / NSEC_PER_SEC;
ts->tv_nsec = nsecs - ts->tv_sec * NSEC_PER_SEC; ts->tv_nsec = nsecs - ts->tv_sec * NSEC_PER_SEC;