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

Tiva Timer: Timer test must attach a timer handler or the timer is stopped at the first interrupt

Browse Source
This commit is contained in:
Gregory Nutt 2015-01-13 15:55:54 -06:00
parent 08638e10bd
commit fe4e3f4529
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/src/sam34/sam_tc.c
View File

@ -276,7 +276,9 @@ static int sam34_interrupt(int irq, FAR void *context)
{ {
uint32_t timeout; uint32_t timeout;
/* Is there a registered handler? */ /* Is there a registered handler? If the handler has been nullified,
* the timer will be stopped.
*/
if (priv->handler && priv->handler(&priv->timeout)) if (priv->handler && priv->handler(&priv->timeout))
{ {
@ -291,9 +293,12 @@ static int sam34_interrupt(int irq, FAR void *context)
timeout = (1000000ULL * priv->clkticks) / TC_FCLK; /* trucated timeout */ timeout = (1000000ULL * priv->clkticks) / TC_FCLK; /* trucated timeout */
priv->adjustment = (priv->adjustment + priv->timeout) - timeout; /* truncated time to be added to next interval (dither) */ priv->adjustment = (priv->adjustment + priv->timeout) - timeout; /* truncated time to be added to next interval (dither) */
} }
else /* stop */ else
{ {
/* No handler or the handler returned false.. stop the timer */
sam34_stop((FAR struct timer_lowerhalf_s *)priv); sam34_stop((FAR struct timer_lowerhalf_s *)priv);
tcvdbg("Stopped\n");
} }
/* TC_INT_CPCS is cleared by reading SAM_TCx_SR */ /* TC_INT_CPCS is cleared by reading SAM_TCx_SR */

36
arch/arm/src/tiva/tiva_timerlow32.c
View File

@ -87,7 +87,7 @@ struct tiva_lowerhalf_s
static uint32_t tiva_usec2ticks(struct tiva_lowerhalf_s *priv, uint32_t usecs); static uint32_t tiva_usec2ticks(struct tiva_lowerhalf_s *priv, uint32_t usecs);
static uint32_t tiva_ticks2usec(struct tiva_lowerhalf_s *priv, uint32_t ticks); static uint32_t tiva_ticks2usec(struct tiva_lowerhalf_s *priv, uint32_t ticks);
static int tiva_timeout(struct tiva_lowerhalf_s *priv, uint32_t timeout); static void tiva_timeout(struct tiva_lowerhalf_s *priv, uint32_t timeout);
/* Interrupt handling *******************************************************/ /* Interrupt handling *******************************************************/
@ -192,11 +192,11 @@ static uint32_t tiva_ticks2usec(struct tiva_lowerhalf_s *priv, uint32_t ticks)
* timeout - The new timeout value in microseconds. * timeout - The new timeout value in microseconds.
* *
* Returned Values: * Returned Values:
* Zero on success; a negated errno value on failure. * None
* *
****************************************************************************/ ****************************************************************************/
static int tiva_timeout(struct tiva_lowerhalf_s *priv, uint32_t timeout) static void tiva_timeout(struct tiva_lowerhalf_s *priv, uint32_t timeout)
{ {
timvdbg("Entry: timeout=%d\n", timeout); timvdbg("Entry: timeout=%d\n", timeout);
@ -215,8 +215,6 @@ static int tiva_timeout(struct tiva_lowerhalf_s *priv, uint32_t timeout)
timvdbg("clkin=%d clkticks=%d timeout=%d, adjustment=%d\n", timvdbg("clkin=%d clkticks=%d timeout=%d, adjustment=%d\n",
priv->clkin, priv->clkticks, priv->timeout, priv->adjustment); priv->clkin, priv->clkticks, priv->timeout, priv->adjustment);
return OK;
} }
/**************************************************************************** /****************************************************************************
@ -246,7 +244,9 @@ static void tiva_handler(TIMER_HANDLE handle, void *arg, uint32_t status)
{ {
uint32_t timeout; uint32_t timeout;
/* Is there a registered handler? */ /* Is there a registered handler? If the handler has been nullified,
* the timer will be stopped.
*/
if (priv->handler && priv->handler(&priv->timeout)) if (priv->handler && priv->handler(&priv->timeout))
{ {
@ -269,9 +269,12 @@ static void tiva_handler(TIMER_HANDLE handle, void *arg, uint32_t status)
timeout = tiva_ticks2usec(priv, priv->clkticks); timeout = tiva_ticks2usec(priv, priv->clkticks);
priv->adjustment = (priv->adjustment + priv->timeout) - timeout; priv->adjustment = (priv->adjustment + priv->timeout) - timeout;
} }
else /* stop */ else
{ {
/* No handler or the handler returned false.. stop the timer */
tiva_timer32_stop(priv->handle); tiva_timer32_stop(priv->handle);
timvdbg("Stopped\n");
} }
} }
} }
@ -422,7 +425,6 @@ static int tiva_getstatus(struct timer_lowerhalf_s *lower,
static int tiva_settimeout(struct timer_lowerhalf_s *lower, uint32_t timeout) static int tiva_settimeout(struct timer_lowerhalf_s *lower, uint32_t timeout)
{ {
struct tiva_lowerhalf_s *priv = (struct tiva_lowerhalf_s *)lower; struct tiva_lowerhalf_s *priv = (struct tiva_lowerhalf_s *)lower;
int ret;
DEBUGASSERT(priv); DEBUGASSERT(priv);
@ -435,15 +437,12 @@ static int tiva_settimeout(struct timer_lowerhalf_s *lower, uint32_t timeout)
/* Calculate the the new time settings */ /* Calculate the the new time settings */
ret = tiva_timeout(priv, timeout); tiva_timeout(priv, timeout);
if (ret == OK)
{
/* Reset the timer interval */
tiva_timer32_setinterval(priv->handle, priv->clkticks); /* Reset the timer interval */
}
return ret; tiva_timer32_setinterval(priv->handle, priv->clkticks);
return OK;
} }
/**************************************************************************** /****************************************************************************
@ -584,12 +583,7 @@ int tiva_timer_register(const char *devpath, int gptm, uint32_t timeout,
/* Set the initial timer interval */ /* Set the initial timer interval */
ret = tiva_timeout(priv, timeout); tiva_timeout(priv, timeout);
if (ret < 0)
{
timdbg("ERROR: Failed to set initial timeout\n");
goto errout_with_alloc;
}
/* Create the timer handle */ /* Create the timer handle */