summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/common
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/common
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/common')
-rw-r--r--nuttx/arch/arm/src/common/up_initialize.c2
-rw-r--r--nuttx/arch/arm/src/common/up_internal.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c
index 8b6b4bd37..c96abe35e 100644
--- a/nuttx/arch/arm/src/common/up_initialize.c
+++ b/nuttx/arch/arm/src/common/up_initialize.c
@@ -183,7 +183,7 @@ void up_initialize(void)
#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) && \
!defined(CONFIG_SYSTEMTICK_EXTCLK)
- up_timerinit();
+ up_timer_initialize();
#endif
/* Register devices */
diff --git a/nuttx/arch/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h
index 4cd464347..752d5c4a1 100644
--- a/nuttx/arch/arm/src/common/up_internal.h
+++ b/nuttx/arch/arm/src/common/up_internal.h
@@ -418,7 +418,7 @@ void up_restorefpu(const uint32_t *regs);
/* System timer *************************************************************/
-void up_timerinit(void);
+void up_timer_initialize(void);
int up_timerisr(int irq, uint32_t *regs);
/* Low level serial output **************************************************/