summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/lpc43xx
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/lpc43xx
parente42e89d84e13db8feda4056b3e3499a14b065d47 (diff)
downloadnuttx-893d3a9e60609f17026d1eeb774ab993ea393c42.tar.gz
nuttx-893d3a9e60609f17026d1eeb774ab993ea393c42.tar.bz2
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/lpc43xx')
-rw-r--r--nuttx/arch/arm/src/lpc43xx/Make.defs8
-rw-r--r--nuttx/arch/arm/src/lpc43xx/lpc43_timerisr.c4
2 files changed, 8 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/lpc43xx/Make.defs b/nuttx/arch/arm/src/lpc43xx/Make.defs
index 366c051df..9b4053b3b 100644
--- a/nuttx/arch/arm/src/lpc43xx/Make.defs
+++ b/nuttx/arch/arm/src/lpc43xx/Make.defs
@@ -1,7 +1,7 @@
############################################################################
# arch/arm/src/lpc43xx/Make.defs
#
-# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
+# Copyright (C) 2012-2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@@ -85,7 +85,11 @@ endif
CHIP_ASRCS =
CHIP_CSRCS = lpc43_allocateheap.c lpc43_cgu.c lpc43_clrpend.c lpc43_gpio.c
CHIP_CSRCS += lpc43_irq.c lpc43_pinconfig.c lpc43_rgu.c lpc43_serial.c
-CHIP_CSRCS += lpc43_start.c lpc43_timerisr.c lpc43_uart.c
+CHIP_CSRCS += lpc43_start.c lpc43_uart.c
+
+ifneq ($(CONFIG_SCHED_TICKLESS),y)
+CHIP_CSRCS += lpc43_timerisr.c
+endif
ifeq ($(CONFIG_NUTTX_KERNEL),y)
CHIP_CSRCS += lpc43_userspace.c lpc43_mpuinit.c
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_timerisr.c b/nuttx/arch/arm/src/lpc43xx/lpc43_timerisr.c
index 83a64e34f..81a2937c5 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_timerisr.c
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_timerisr.c
@@ -107,7 +107,7 @@ int up_timerisr(int irq, uint32_t *regs)
}
/****************************************************************************
- * Function: up_timerinit
+ * Function: up_timer_initialize
*
* Description:
* This function is called during start-up to initialize
@@ -115,7 +115,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
-void up_timerinit(void)
+void up_timer_initialize(void)
{
uint32_t regval;