summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/calypso/calypso_timer.c
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-08-06 16:26:01 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-08-06 16:26:01 -0600
commit893d3a9e60609f17026d1eeb774ab993ea393c42 (patch)
treeae0789b7eadbdac15f2b63c67663dd42df397e49 /nuttx/arch/arm/src/calypso/calypso_timer.c
parente42e89d84e13db8feda4056b3e3499a14b065d47 (diff)
downloadpx4-nuttx-893d3a9e60609f17026d1eeb774ab993ea393c42.tar.gz
px4-nuttx-893d3a9e60609f17026d1eeb774ab993ea393c42.tar.bz2
px4-nuttx-893d3a9e60609f17026d1eeb774ab993ea393c42.zip
Rename up_timerinit() to up_timer_initailize(); Add prototypes for candidate interfaces for the tickless OS; Don't build existing timer initialization logic if CONFIG_SCHED_TICKLESS is defined.
Diffstat (limited to 'nuttx/arch/arm/src/calypso/calypso_timer.c')
-rw-r--r--nuttx/arch/arm/src/calypso/calypso_timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/calypso/calypso_timer.c b/nuttx/arch/arm/src/calypso/calypso_timer.c
index 39eca0307..7ce3f2efd 100644
--- a/nuttx/arch/arm/src/calypso/calypso_timer.c
+++ b/nuttx/arch/arm/src/calypso/calypso_timer.c
@@ -180,7 +180,7 @@ int up_timerisr(int irq, uint32_t *regs)
}
/************************************************************
- * Function: up_timerinit
+ * Function: up_timer_initialize
*
* Description:
* Setup Calypso HW timer 2 to cause system ticks.
@@ -190,7 +190,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
************************************************************/
-void up_timerinit(void)
+void up_timer_initialize(void)
{
up_disable_irq(IRQ_SYSTIMER);