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.

2 files changed, 8 insertions, 5 deletions

diff --git a/nuttx/arch/arm/src/kinetis/Make.defs b/nuttx/arch/arm/src/kinetis/Make.defs
index 0429dfadd..6f0de0594 100644
--- a/nuttx/arch/arm/src/kinetis/Make.defs
+++ b/nuttx/arch/arm/src/kinetis/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # arch/arm/src/kinetis/Make.defs
 #
-#   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011, 2013-2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -83,11 +83,14 @@ CHIP_ASRCS  =
 CHIP_CSRCS  = kinetis_allocateheap.c kinetis_clockconfig.c
 CHIP_CSRCS += kinetis_clrpend.c kinetis_idle.c kinetis_irq.c
 CHIP_CSRCS += kinetis_lowputc.c kinetis_pin.c kinetis_pingpio.c
-CHIP_CSRCS += kinetis_serial.c kinetis_start.c kinetis_timerisr.c
-CHIP_CSRCS += kinetis_wdog.c
+CHIP_CSRCS += kinetis_serial.c kinetis_start.c kinetis_wdog.c
 
 # Configuration-dependent Kinetis files
 
+ifneq ($(CONFIG_SCHED_TICKLESS),y)
+CHIP_CSRCS += kinetis_timerisr.c
+endif
+
 ifeq ($(CONFIG_NUTTX_KERNEL),y)
 CHIP_CSRCS += kinetis_userspace.c kinetis_mpuinit.c
 endif
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c b/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c
index 8dd514a9c..b4bde4cae 100644
--- a/nuttx/arch/arm/src/kinetis/kinetis_timerisr.c
+++ b/nuttx/arch/arm/src/kinetis/kinetis_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;