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.

8 files changed, 39 insertions, 29 deletions

diff --git a/nuttx/arch/z80/src/common/up_initialize.c b/nuttx/arch/z80/src/common/up_initialize.c
index 8b4717a9b..a73c09823 100644
--- a/nuttx/arch/z80/src/common/up_initialize.c
+++ b/nuttx/arch/z80/src/common/up_initialize.c
@@ -131,7 +131,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
 
   /* Initialize the CPU for those that use it (only for the Z180).  This
diff --git a/nuttx/arch/z80/src/common/up_internal.h b/nuttx/arch/z80/src/common/up_internal.h
index 3581242fb..bd5b0f70b 100644
--- a/nuttx/arch/z80/src/common/up_internal.h
+++ b/nuttx/arch/z80/src/common/up_internal.h
@@ -182,7 +182,7 @@ extern void up_puts(const char *str);
 
 /* Defined in up_timerisr.c */
 
-void up_timerinit(void);
+void up_timer_initialize(void);
 
 /* Defined in board/up_leds.c */
 
diff --git a/nuttx/arch/z80/src/ez80/Make.defs b/nuttx/arch/z80/src/ez80/Make.defs
index 271ff0f9d..3ce0b4c42 100644
--- a/nuttx/arch/z80/src/ez80/Make.defs
+++ b/nuttx/arch/z80/src/ez80/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # arch/z80/src/ez80/Make.defs
 #
-#   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008-2009, 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -33,27 +33,31 @@
 #
 ############################################################################
 
-HEAD_ASRC	= ez80_vectors.asm
-HEAD_SSRC	=
+HEAD_ASRC = ez80_vectors.asm
+HEAD_SSRC =
 
-CMN_SSRCS	=
-CMN_CSRCS	= up_initialize.c up_allocateheap.c up_createstack.c \
+CMN_SSRCS =
+CMN_CSRCS = up_initialize.c up_allocateheap.c up_createstack.c \
 		  up_releasestack.c up_interruptcontext.c up_blocktask.c \
 		  up_unblocktask.c up_exit.c up_releasepending.c \
 		  up_reprioritizertr.c up_idle.c up_assert.c up_doirq.c \
 		  up_mdelay.c up_udelay.c up_usestack.c up_puts.c
 
-CHIP_ASRCS	= ez80_startup.asm ez80_io.asm ez80_irqsave.asm \
+CHIP_ASRCS = ez80_startup.asm ez80_io.asm ez80_irqsave.asm \
 		  ez80_saveusercontext.asm ez80_restorecontext.asm
 ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y)
-CHIP_ASRCS	+= ez80f91_init.asm
+CHIP_ASRCS += ez80f91_init.asm
+endif
+
+CHIP_SSRCS  =
+CHIP_CSRCS  = ez80_clock.c ez80_initialstate.c ez80_irq.c ez80_copystate.c
+CHIP_CSRCS += ez80_schedulesigaction.c ez80_sigdeliver.c ez80_lowuart.c
+CHIP_CSRCS += ez80_serial.c ez80_spi.c ez80_i2c.c ez80_registerdump.c
+
+ifneq ($(CONFIG_SCHED_TICKLESS),y)
+CHIP_CSRCS += ez80_timerisr.c
 endif
 
-CHIP_SSRCS	=
-CHIP_CSRCS	= ez80_clock.c ez80_initialstate.c ez80_irq.c ez80_copystate.c \
-		  ez80_schedulesigaction.c ez80_sigdeliver.c ez80_timerisr.c \
-		  ez80_lowuart.c ez80_serial.c ez80_spi.c ez80_i2c.c \
-		  ez80_registerdump.c
 ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y)
 ifeq ($(CONFIG_EZ80_EMAC),y)
 CHIP_CSRCS	+= ez80_emac.c
diff --git a/nuttx/arch/z80/src/ez80/ez80_timerisr.c b/nuttx/arch/z80/src/ez80/ez80_timerisr.c
index 3cb3d029d..abda72877 100644
--- a/nuttx/arch/z80/src/ez80/ez80_timerisr.c
+++ b/nuttx/arch/z80/src/ez80/ez80_timerisr.c
@@ -102,7 +102,7 @@ int up_timerisr(int irq, chipreg_t *regs)
 }
 
 /***************************************************************************
- * Function:  up_timerinit
+ * Function:  up_timer_initialize
  *
  * Description:
  *   This function is called during start-up to initialize the timer
@@ -110,7 +110,7 @@ int up_timerisr(int irq, chipreg_t *regs)
  *
  ***************************************************************************/
 
-void up_timerinit(void)
+void up_timer_initialize(void)
 {
   uint16_t reload;
   uint8_t  reg;
diff --git a/nuttx/arch/z80/src/z180/Make.defs b/nuttx/arch/z80/src/z180/Make.defs
index ad658094b..3e8c4b7f4 100644
--- a/nuttx/arch/z80/src/z180/Make.defs
+++ b/nuttx/arch/z80/src/z180/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # arch/z80/src/z180/Make.defs
 #
-#   Copyright (C) 2012 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
@@ -60,4 +60,7 @@ endif
 CHIP_CSRCS  = z180_copystate.c z180_initialstate.c z180_io.c z180_irq.c
 CHIP_CSRCS += z180_lowscc.c z180_lowserial.c z180_modifiyreg8.c z180_mmu.c
 CHIP_CSRCS += z180_registerdump.c z180_schedulesigaction.c z180_sigdeliver.c
+
+ifneq ($(CONFIG_SCHED_TICKLESS),y)
 CHIP_CSRCS += z180_timerisr.c
+endif
diff --git a/nuttx/arch/z80/src/z180/z180_timerisr.c b/nuttx/arch/z80/src/z180/z180_timerisr.c
index bf041519e..55a52c9cb 100644
--- a/nuttx/arch/z80/src/z180/z180_timerisr.c
+++ b/nuttx/arch/z80/src/z180/z180_timerisr.c
@@ -112,7 +112,7 @@ int up_timerisr(int irq, chipreg_t *regs)
 }
 
 /****************************************************************************
- * Function: up_timerinit
+ * Function: up_timer_initialize
  *
  * Description:
  *   This function is called during start-up to initialize the timer
@@ -120,7 +120,7 @@ int up_timerisr(int irq, chipreg_t *regs)
  *
  ****************************************************************************/
 
-void up_timerinit(void)
+void up_timer_initialize(void)
 {
   uint8_t regval;
 
diff --git a/nuttx/arch/z80/src/z8/Make.defs b/nuttx/arch/z80/src/z8/Make.defs
index 781c82182..50f1d98b0 100644
--- a/nuttx/arch/z80/src/z8/Make.defs
+++ b/nuttx/arch/z80/src/z8/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # arch/z80/src/z8/Make.defs
 #
-#   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008-2009, 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -33,17 +33,20 @@
 #
 ############################################################################
 
-HEAD_SSRC	= z8_head.S
+HEAD_SSRC = z8_head.S
 
-CMN_SSRCS	=
-CMN_CSRCS	= up_initialize.c up_allocateheap.c up_createstack.c \
+CMN_SSRCS =
+CMN_CSRCS = up_initialize.c up_allocateheap.c up_createstack.c \
 		  up_releasestack.c up_interruptcontext.c up_blocktask.c \
 		  up_unblocktask.c up_exit.c up_releasepending.c \
 		  up_reprioritizertr.c up_idle.c up_assert.c up_doirq.c \
 		  up_mdelay.c up_udelay.c up_usestack.c
 
-CHIP_SSRCS	= z8_vector.S z8_saveusercontext.S z8_restorecontext.S
-CHIP_CSRCS	= z8_initialstate.c z8_irq.c z8_saveirqcontext.c \
-		  z8_schedulesigaction.c z8_sigdeliver.c z8_timerisr.c \
-		  z8_lowuart.c z8_serial.c z8_i2c.c z8_registerdump.c
+CHIP_SSRCS  = z8_vector.S z8_saveusercontext.S z8_restorecontext.S
+CHIP_CSRCS  = z8_initialstate.c z8_irq.c z8_saveirqcontext.c
+CHIP_CSRCS += z8_schedulesigaction.c z8_sigdeliver.c z8_lowuart.c
+CHIP_CSRCS += z8_serial.c z8_i2c.c z8_registerdump.c
 
+ifneq ($(CONFIG_SCHED_TICKLESS),y)
+CHIP_CSRCS += z8_timerisr.c
+endif
diff --git a/nuttx/arch/z80/src/z8/z8_timerisr.c b/nuttx/arch/z80/src/z8/z8_timerisr.c
index 14009fe2e..92113e482 100644
--- a/nuttx/arch/z80/src/z8/z8_timerisr.c
+++ b/nuttx/arch/z80/src/z8/z8_timerisr.c
@@ -87,7 +87,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 the timer
@@ -95,7 +95,7 @@ int up_timerisr(int irq, uint32_t *regs)
  *
  ***************************************************************************/
 
-void up_timerinit(void)
+void up_timer_initialize(void)
 {
   uint32_t reload;