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, 7 insertions, 3 deletions

diff --git a/nuttx/arch/arm/src/samd/Make.defs b/nuttx/arch/arm/src/samd/Make.defs
index 1dd26d643..308757881 100644
--- a/nuttx/arch/arm/src/samd/Make.defs
+++ b/nuttx/arch/arm/src/samd/Make.defs
@@ -70,7 +70,11 @@ endif
 CHIP_ASRCS  =
 CHIP_CSRCS  = sam_clockconfig.c sam_idle.c sam_irq.c sam_lowputc.c
 CHIP_CSRCS += sam_port.c sam_sercom.c sam_serial.c sam_start.c
-CHIP_CSRCS += sam_timerisr.c sam_usart.c
+CHIP_CSRCS += sam_usart.c
+
+ifneq ($(CONFIG_SCHED_TICKLESS),y)
+CHIP_CSRCS += sam_timerisr.c
+endif
 
 ifeq ($(CONFIG_NUTTX_KERNEL),y)
 CHIP_CSRCS += sam_userspace.c
diff --git a/nuttx/arch/arm/src/samd/sam_timerisr.c b/nuttx/arch/arm/src/samd/sam_timerisr.c
index dad9f0812..766486f02 100644
--- a/nuttx/arch/arm/src/samd/sam_timerisr.c
+++ b/nuttx/arch/arm/src/samd/sam_timerisr.c
@@ -110,7 +110,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
@@ -118,7 +118,7 @@ int up_timerisr(int irq, uint32_t *regs)
  *
  ****************************************************************************/
 
-void up_timerinit(void)
+void up_timer_initialize(void)
 {
   uint32_t regval;