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

apps/examples/timer: Restore the timer example, but adapt the interface to use the new signal logic from Sebastien, Lorquet. Totally untested and probably does not work!

Browse Source
This commit is contained in:
Gregory Nutt 2016-11-17 15:18:52 -06:00
parent 19c1c9d78b
commit f92afbfbf3
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ struct tiva_lowerhalf_s
const struct timer_ops_s *ops; /* Lower half operations */ const struct timer_ops_s *ops; /* Lower half operations */
struct tiva_gptm32config_s config; /* Persistent timer configuration */ struct tiva_gptm32config_s config; /* Persistent timer configuration */
TIMER_HANDLE handle; /* Contained timer handle */ TIMER_HANDLE handle; /* Contained timer handle */
tccb_t handler; /* Current user interrupt handler */ tccb_t callback; /* Current user interrupt callback */
uint32_t clkin; /* Input clock frequency */ uint32_t clkin; /* Input clock frequency */
uint32_t timeout; /* The current timeout value (us) */ uint32_t timeout; /* The current timeout value (us) */
uint32_t clkticks; /* Actual clock ticks for current interval */ uint32_t clkticks; /* Actual clock ticks for current interval */
@ -99,8 +99,8 @@ static int tiva_getstatus(struct timer_lowerhalf_s *lower,
struct timer_status_s *status); struct timer_status_s *status);
static int tiva_settimeout(struct timer_lowerhalf_s *lower, static int tiva_settimeout(struct timer_lowerhalf_s *lower,
uint32_t timeout); uint32_t timeout);
static tccb_t tiva_sethandler(struct timer_lowerhalf_s *lower, static void tiva_setcallback(struct timer_lowerhalf_s *lower,
tccb_t handler); tccb_t callback, FAR void *arg);
static int tiva_ioctl(struct timer_lowerhalf_s *lower, int cmd, static int tiva_ioctl(struct timer_lowerhalf_s *lower, int cmd,
unsigned long arg); unsigned long arg);
@ -111,12 +111,12 @@ static int tiva_ioctl(struct timer_lowerhalf_s *lower, int cmd,
static const struct timer_ops_s g_timer_ops = static const struct timer_ops_s g_timer_ops =
{ {
.start = tiva_start, .start = tiva_start,
.stop = tiva_stop, .stop = tiva_stop,
.getstatus = tiva_getstatus, .getstatus = tiva_getstatus,
.settimeout = tiva_settimeout, .settimeout = tiva_settimeout,
.sethandler = tiva_sethandler, .setcallback = tiva_setcallback,
.ioctl = tiva_ioctl, .ioctl = tiva_ioctl,
}; };
/**************************************************************************** /****************************************************************************
@ -242,11 +242,11 @@ static void tiva_timer_handler(TIMER_HANDLE handle, void *arg, uint32_t status)
{ {
uint32_t timeout; uint32_t timeout;
/* Is there a registered handler? If the handler has been nullified, /* Is there a registered callback? If the callback has been nullified,
* the timer will be stopped. * the timer will be stopped.
*/ */
if (priv->handler && priv->handler(&priv->timeout)) if (priv->callback && priv->callback(&priv->timeout, priv->arg))
{ {
/* Calculate new ticks / dither adjustment */ /* Calculate new ticks / dither adjustment */
@ -269,7 +269,7 @@ static void tiva_timer_handler(TIMER_HANDLE handle, void *arg, uint32_t status)
} }
else else
{ {
/* No handler or the handler returned false.. stop the timer */ /* No callback or the callback returned false.. stop the timer */
tiva_timer32_stop(priv->handle); tiva_timer32_stop(priv->handle);
tmrinfo("Stopped\n"); tmrinfo("Stopped\n");
@ -384,7 +384,7 @@ static int tiva_getstatus(struct timer_lowerhalf_s *lower,
status->flags |= TCFLAGS_ACTIVE; status->flags |= TCFLAGS_ACTIVE;
} }
if (priv->handler) if (priv->callback)
{ {
status->flags |= TCFLAGS_HANDLER; status->flags |= TCFLAGS_HANDLER;
} }
@ -444,17 +444,17 @@ static int tiva_settimeout(struct timer_lowerhalf_s *lower, uint32_t timeout)
} }
/**************************************************************************** /****************************************************************************
* Name: tiva_sethandler * Name: tiva_setcallback
* *
* Description: * Description:
* Call this user provided timeout handler. * Call this user provided timeout callback.
* *
* Input Parameters: * Input Parameters:
* lower - A pointer the publicly visible representation of the "lower-half" * lower - A pointer the publicly visible representation of the "lower-half"
* driver state structure. * driver state structure.
* newhandler - The new timer expiration function pointer. If this * callback - The new timer expiration function pointer. If this
* function pointer is NULL, then the reset-on-expiration * function pointer is NULL, then the reset-on-expiration
* behavior is restored, * behavior is restored,
* *
* Returned Values: * Returned Values:
* The previous timer expiration function pointer or NULL is there was * The previous timer expiration function pointer or NULL is there was
@ -462,28 +462,23 @@ static int tiva_settimeout(struct timer_lowerhalf_s *lower, uint32_t timeout)
* *
****************************************************************************/ ****************************************************************************/
static tccb_t tiva_sethandler(struct timer_lowerhalf_s *lower, static void tiva_setcallback(struct timer_lowerhalf_s *lower,
tccb_t handler) tccb_t callback, FAR void *arg)
{ {
struct tiva_lowerhalf_s *priv = (struct tiva_lowerhalf_s *)lower; struct tiva_lowerhalf_s *priv = (struct tiva_lowerhalf_s *)lower;
irqstate_t flags; irqstate_t flags;
tccb_t oldhandler;
flags = enter_critical_section(); flags = enter_critical_section();
DEBUGASSERT(priv); DEBUGASSERT(priv);
tmrinfo("Entry: handler=%p\n", handler); tmrinfo("Entry: callback=%p\n", callback);
/* Get the old handler return value */ /* Save the new callback */
oldhandler = priv->handler; priv->callback = callback;
priv->arg = arg;
/* Save the new handler */
priv->handler = handler;
leave_critical_section(flags); leave_critical_section(flags);
return oldhandler;
} }
/**************************************************************************** /****************************************************************************