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, 50 insertions, 43 deletions

diff --git a/nuttx/arch/avr/src/at32uc3/Make.defs b/nuttx/arch/avr/src/at32uc3/Make.defs
index 69d17456d..fa1f010cf 100644
--- a/nuttx/arch/avr/src/at32uc3/Make.defs
+++ b/nuttx/arch/avr/src/at32uc3/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # arch/avr/src/at32uc3/Make.defs
 #
-#   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,12 +35,12 @@
 
 # The start-up, "head", file
 
-HEAD_ASRC	= up_nommuhead.S
+HEAD_ASRC = up_nommuhead.S
 
 # Common AVR/AVR32 files
 
-CMN_ASRCS	= up_exceptions.S up_fullcontextrestore.S up_switchcontext.S
-CMN_CSRCS	= up_assert.c up_allocateheap.c up_blocktask.c up_copystate.c \
+CMN_ASRCS = up_exceptions.S up_fullcontextrestore.S up_switchcontext.S
+CMN_CSRCS = up_assert.c up_allocateheap.c up_blocktask.c up_copystate.c \
 		  up_createstack.c up_mdelay.c up_udelay.c up_exit.c up_idle.c \
 		  up_initialize.c up_initialstate.c up_interruptcontext.c \
 		  up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c \
@@ -51,20 +51,21 @@ CMN_CSRCS	= up_assert.c up_allocateheap.c up_blocktask.c up_copystate.c \
 # Configuration-dependent common files
 
 ifeq ($(CONFIG_ARCH_STACKDUMP),y)
-CMN_CSRCS	+= up_dumpstate.c
+CMN_CSRCS += up_dumpstate.c
 endif
 
 # Required AT32UC3 files
 
-CHIP_ASRCS	=
-CHIP_CSRCS	= at32uc3_clkinit.c at32uc3_gpio.c at32uc3_irq.c \
-		  at32uc3_lowconsole.c at32uc3_lowinit.c at32uc3_serial.c \
-		  at32uc3_timerisr.c
+CHIP_ASRCS =
+CHIP_CSRCS = at32uc3_clkinit.c at32uc3_gpio.c at32uc3_irq.c \
+		  at32uc3_lowconsole.c at32uc3_lowinit.c at32uc3_serial.c
 
 # Configuration-dependent AT32UC3 files
 
-ifeq ($(CONFIG_AVR32_GPIOIRQ),y)
-CHIP_CSRCS	+= at32uc3_gpioirq.c
+ifneq ($(CONFIG_SCHED_TICKLESS),y)
+CHIP_CSRCS += at32uc3_timerisr.c
 endif
 
-
+ifeq ($(CONFIG_AVR32_GPIOIRQ),y)
+CHIP_CSRCS += at32uc3_gpioirq.c
+endif
diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_timerisr.c b/nuttx/arch/avr/src/at32uc3/at32uc3_timerisr.c
index 361fb8ec2..b12f8e264 100644
--- a/nuttx/arch/avr/src/at32uc3/at32uc3_timerisr.c
+++ b/nuttx/arch/avr/src/at32uc3/at32uc3_timerisr.c
@@ -178,7 +178,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
@@ -187,7 +187,7 @@ int up_timerisr(int irq, uint32_t *regs)
  *
  ****************************************************************************/
 
-void up_timerinit(void)
+void up_timer_initialize(void)
 {
   uint32_t regval;
 
diff --git a/nuttx/arch/avr/src/at90usb/Make.defs b/nuttx/arch/avr/src/at90usb/Make.defs
index be3726134..fb79d877c 100644
--- a/nuttx/arch/avr/src/at90usb/Make.defs
+++ b/nuttx/arch/avr/src/at90usb/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # arch/avr/src/at90usb/Make.defs
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,12 +35,12 @@
 
 # The start-up, "head", file
 
-HEAD_ASRC	= at90usb_head.S
+HEAD_ASRC = at90usb_head.S
 
 # Common AVR files
 
-CMN_ASRCS	= up_switchcontext.S
-CMN_CSRCS	= up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
+CMN_ASRCS = up_switchcontext.S
+CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
 			  up_createstack.c up_doirq.c up_exit.c  up_idle.c up_initialize.c \
 			  up_initialstate.c up_interruptcontext.c up_irq.c up_lowputs.c \
 			  up_mdelay.c up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c \
@@ -51,29 +51,33 @@ CMN_CSRCS	= up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
 # Configuration-dependent common files
 
 ifeq ($(CONFIG_ARCH_STACKDUMP),y)
-CMN_CSRCS	+= up_dumpstate.c
+CMN_CSRCS += up_dumpstate.c
 endif
 
 ifeq ($(CONFIG_AVR_SPI),y)
-CMN_CSRCS	+= up_spi.c
+CMN_CSRCS += up_spi.c
 endif
 
 ifeq ($(CONFIG_DEBUG_STACK),y)
-CMN_CSRCS	+= up_checkstack.c
+CMN_CSRCS += up_checkstack.c
 endif
 
 ifeq ($(CONFIG_ARCH_ROMGETC),y)
-CMN_CSRCS	+= up_romgetc.c
+CMN_CSRCS += up_romgetc.c
 endif
 
 # Required AT90USB files
 
-CHIP_ASRCS	= at90usb_exceptions.S
-CHIP_CSRCS	= at90usb_lowconsole.c at90usb_lowinit.c at90usb_serial.c at90usb_timerisr.c
+CHIP_ASRCS = at90usb_exceptions.S
+CHIP_CSRCS = at90usb_lowconsole.c at90usb_lowinit.c at90usb_serial.c
 
 # Configuration-dependent aT90USB files
 
+ifneq ($(CONFIG_SCHED_TICKLESS),y)
+CHIP_CSRCS += at90usb_timerisr.c
+endif
+
 ifeq ($(CONFIG_AVR_USBDEV),y)
-CHIP_CSRCS      += at90usb_usbdev.c
+CHIP_CSRCS += at90usb_usbdev.c
 endif
 
diff --git a/nuttx/arch/avr/src/at90usb/at90usb_timerisr.c b/nuttx/arch/avr/src/at90usb/at90usb_timerisr.c
index 21e577ad2..a6e82b604 100644
--- a/nuttx/arch/avr/src/at90usb/at90usb_timerisr.c
+++ b/nuttx/arch/avr/src/at90usb/at90usb_timerisr.c
@@ -132,7 +132,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
@@ -141,7 +141,7 @@ int up_timerisr(int irq, uint32_t *regs)
  *
  ****************************************************************************/
 
-void up_timerinit(void)
+void up_timer_initialize(void)
 {
   /* Setup timer 1 compare match A to generate a tick interrupt.
    *
diff --git a/nuttx/arch/avr/src/atmega/Make.defs b/nuttx/arch/avr/src/atmega/Make.defs
index 826d372a1..7ffd174e0 100644
--- a/nuttx/arch/avr/src/atmega/Make.defs
+++ b/nuttx/arch/avr/src/atmega/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # arch/avr/src/atmega/Make.defs
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,12 +35,12 @@
 
 # The start-up, "head", file
 
-HEAD_ASRC	= atmega_head.S
+HEAD_ASRC = atmega_head.S
 
 # Common AVR files
 
-CMN_ASRCS	= up_switchcontext.S
-CMN_CSRCS	= up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
+CMN_ASRCS = up_switchcontext.S
+CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
 			  up_createstack.c up_doirq.c up_exit.c  up_idle.c up_initialize.c \
 			  up_initialstate.c up_interruptcontext.c up_irq.c up_lowputs.c \
 			  up_mdelay.c up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c \
@@ -51,30 +51,32 @@ CMN_CSRCS	= up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
 # Configuration-dependent common files
 
 ifeq ($(CONFIG_ARCH_STACKDUMP),y)
-CMN_CSRCS	+= up_dumpstate.c
+CMN_CSRCS += up_dumpstate.c
 endif
 
 ifeq ($(CONFIG_AVR_SPI),y)
-CMN_CSRCS	+= up_spi.c
+CMN_CSRCS += up_spi.c
 endif
 
 ifeq ($(CONFIG_DEBUG_STACK),y)
-CMN_CSRCS	+= up_checkstack.c
+CMN_CSRCS += up_checkstack.c
 endif
 
 ifeq ($(CONFIG_ARCH_ROMGETC),y)
-CMN_CSRCS	+= up_romgetc.c
+CMN_CSRCS += up_romgetc.c
 endif
 
 # Required ATMEGA files
 
-CHIP_ASRCS	= atmega_exceptions.S
-CHIP_CSRCS	= atmega_lowconsole.c atmega_lowinit.c atmega_serial.c atmega_timerisr.c
+CHIP_ASRCS = atmega_exceptions.S
+CHIP_CSRCS = atmega_lowconsole.c atmega_lowinit.c atmega_serial.c
+
+ifneq ($(CONFIG_SCHED_TICKLESS),y)
+CHIP_CSRCS += atmega_timerisr.c
+endif
 
 # Configuration-dependent ATMEGA files
 
 ifeq ($(CONFIG_AVR_GPIOIRQ),y)
 CHIP_CSRCS	+=
 endif
-
-
diff --git a/nuttx/arch/avr/src/atmega/atmega_timerisr.c b/nuttx/arch/avr/src/atmega/atmega_timerisr.c
index bcac060a0..4c3ada87b 100644
--- a/nuttx/arch/avr/src/atmega/atmega_timerisr.c
+++ b/nuttx/arch/avr/src/atmega/atmega_timerisr.c
@@ -132,7 +132,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
@@ -141,7 +141,7 @@ int up_timerisr(int irq, uint32_t *regs)
  *
  ****************************************************************************/
 
-void up_timerinit(void)
+void up_timer_initialize(void)
 {
   /* Setup timer 1 compare match A to generate a tick interrupt.
    *
diff --git a/nuttx/arch/avr/src/common/up_initialize.c b/nuttx/arch/avr/src/common/up_initialize.c
index ed61c5f1c..630e5d405 100644
--- a/nuttx/arch/avr/src/common/up_initialize.c
+++ b/nuttx/arch/avr/src/common/up_initialize.c
@@ -217,7 +217,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/avr/src/common/up_internal.h b/nuttx/arch/avr/src/common/up_internal.h
index 75c9e5cb1..42d4d7d0e 100644
--- a/nuttx/arch/avr/src/common/up_internal.h
+++ b/nuttx/arch/avr/src/common/up_internal.h
@@ -182,7 +182,7 @@ void lowconsole_init(void);
 
 /* Defined in chip/xxx_timerisr.c */
 
-extern void up_timerinit(void);
+extern void up_timer_initialize(void);
 
 /* Defined in configs/<board-name>/src/up_leds.c */