diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-06 16:26:01 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-06 16:26:01 -0600 |
| commit | 893d3a9e60609f17026d1eeb774ab993ea393c42 (patch) | |
| tree | ae0789b7eadbdac15f2b63c67663dd42df397e49 /nuttx/arch/arm/src/c5471 | |
| parent | e42e89d84e13db8feda4056b3e3499a14b065d47 (diff) | |
| download | nuttx-893d3a9e60609f17026d1eeb774ab993ea393c42.tar.gz nuttx-893d3a9e60609f17026d1eeb774ab993ea393c42.tar.bz2 nuttx-893d3a9e60609f17026d1eeb774ab993ea393c42.zip | |
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.
Diffstat (limited to 'nuttx/arch/arm/src/c5471')
| -rw-r--r-- | nuttx/arch/arm/src/c5471/Make.defs | 15 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/c5471/c5471_timerisr.c | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/c5471/Make.defs b/nuttx/arch/arm/src/c5471/Make.defs index 79157d8f8..379d9123d 100644 --- a/nuttx/arch/arm/src/c5471/Make.defs +++ b/nuttx/arch/arm/src/c5471/Make.defs @@ -33,10 +33,10 @@ # ############################################################################ -HEAD_ASRC = up_nommuhead.S +HEAD_ASRC = up_nommuhead.S -CMN_ASRCS = up_saveusercontext.S up_fullcontextrestore.S vfork.S -CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c \ +CMN_ASRCS = up_saveusercontext.S up_fullcontextrestore.S vfork.S +CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c \ up_createstack.c up_dataabort.c up_mdelay.c up_udelay.c up_doirq.c \ up_exit.c up_idle.c up_initialize.c up_initialstate.c \ up_interruptcontext.c up_prefetchabort.c up_releasepending.c \ @@ -52,6 +52,9 @@ ifeq ($(CONFIG_DEBUG_STACK),y) CMN_CSRCS += up_checkstack.c endif -CHIP_ASRCS = c5471_lowputc.S c5471_vectors.S -CHIP_CSRCS = c5471_irq.c c5471_serial.c c5471_timerisr.c c5471_watchdog.c \ - c5471_ethernet.c +CHIP_ASRCS = c5471_lowputc.S c5471_vectors.S +CHIP_CSRCS = c5471_irq.c c5471_serial.c c5471_watchdog.c c5471_ethernet.c + +ifneq ($(CONFIG_SCHED_TICKLESS),y) +CHIP_CSRCS += c5471_timerisr.c +endif diff --git a/nuttx/arch/arm/src/c5471/c5471_timerisr.c b/nuttx/arch/arm/src/c5471/c5471_timerisr.c index 1a221674d..1021fb84a 100644 --- a/nuttx/arch/arm/src/c5471/c5471_timerisr.c +++ b/nuttx/arch/arm/src/c5471/c5471_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 val; |