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.

4 files changed, 9 insertions, 5 deletions

diff --git a/nuttx/arch/z16/src/common/up_initialize.c b/nuttx/arch/z16/src/common/up_initialize.c
index 1b53355f2..3307386b0 100644
--- a/nuttx/arch/z16/src/common/up_initialize.c
+++ b/nuttx/arch/z16/src/common/up_initialize.c
@@ -146,7 +146,7 @@ void up_initialize(void)
   /* Initialize the system timer interrupt */
 
 #if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
-  up_timerinit();
+  up_timer_initialize();
 #endif
 
   /* Register devices */
diff --git a/nuttx/arch/z16/src/common/up_internal.h b/nuttx/arch/z16/src/common/up_internal.h
index 7822a211b..f76b970e3 100644
--- a/nuttx/arch/z16/src/common/up_internal.h
+++ b/nuttx/arch/z16/src/common/up_internal.h
@@ -176,7 +176,7 @@ extern void lowconsole_init(void);
 
 /* Defined in up_timerisr.c */
 
-extern void up_timerinit(void);
+extern void up_timer_initialize(void);
 
 /* Defined in up_irq.c */
 
diff --git a/nuttx/arch/z16/src/z16f/Make.defs b/nuttx/arch/z16/src/z16f/Make.defs
index 99a9fdda6..8db9e8894 100644
--- a/nuttx/arch/z16/src/z16f/Make.defs
+++ b/nuttx/arch/z16/src/z16f/Make.defs
@@ -44,7 +44,11 @@ CMN_CSRCS += up_unblocktask.c up_doirq.c up_releasepending.c up_usestack.c
 CMN_CSRCS += up_exit.c up_releasestack.c up_idle.c up_reprioritizertr.c
 
 CHIP_SSRCS = z16f_lowuart.S z16f_saveusercontext.S z16f_restoreusercontext.S
-CHIP_CSRCS = z16f_clkinit.c z16f_sysexec.c z16f_irq.c z16f_timerisr.c z16f_serial.c
+CHIP_CSRCS = z16f_clkinit.c z16f_sysexec.c z16f_irq.c z16f_serial.c
+
+ifneq ($(CONFIG_SCHED_TICKLESS),y)
+CHIP_CSRCS += z16f_timerisr.c
+endif
 
 ifeq ($(CONFIG_Z16F_ESPI),y)
 CHIP_CSRCS += z16f_espi.c
diff --git a/nuttx/arch/z16/src/z16f/z16f_timerisr.c b/nuttx/arch/z16/src/z16f/z16f_timerisr.c
index 9d0075b9a..2016b557d 100644
--- a/nuttx/arch/z16/src/z16f/z16f_timerisr.c
+++ b/nuttx/arch/z16/src/z16f/z16f_timerisr.c
@@ -99,7 +99,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
@@ -107,7 +107,7 @@ int up_timerisr(int irq, uint32_t *regs)
  *
  ***************************************************************************/
 
-void up_timerinit(void)
+void up_timer_initialize(void)
 {
   uint32_t reload;
   uint32_t scaledfreq;