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/tiva | |
parent | e42e89d84e13db8feda4056b3e3499a14b065d47 (diff) | |
download | px4-nuttx-893d3a9e60609f17026d1eeb774ab993ea393c42.tar.gz px4-nuttx-893d3a9e60609f17026d1eeb774ab993ea393c42.tar.bz2 px4-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/tiva')
-rw-r--r-- | nuttx/arch/arm/src/tiva/Make.defs | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/tiva_timerisr.c | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/tiva/Make.defs b/nuttx/arch/arm/src/tiva/Make.defs index 9fb7a4eb6..e97d5f50f 100644 --- a/nuttx/arch/arm/src/tiva/Make.defs +++ b/nuttx/arch/arm/src/tiva/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # arch/arm/src/tiva/Make.defs # -# Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2009-2011, 2013-2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -74,8 +74,12 @@ endif CHIP_ASRCS = CHIP_CSRCS = tiva_allocateheap.c tiva_start.c tiva_syscontrol.c tiva_irq.c -CHIP_CSRCS += tiva_gpio.c tiva_gpioirq.c tiva_timerisr.c tiva_lowputc.c -CHIP_CSRCS += tiva_serial.c tiva_ssi.c tiva_dumpgpio.c +CHIP_CSRCS += tiva_gpio.c tiva_gpioirq.c tiva_lowputc.c tiva_serial.c +CHIP_CSRCS += tiva_ssi.c tiva_dumpgpio.c + +ifneq ($(CONFIG_SCHED_TICKLESS),y) +CHIP_CSRCS += tiva_timerisr.c +endif ifeq ($(CONFIG_NUTTX_KERNEL),y) CHIP_CSRCS += tiva_userspace.c tiva_mpuinit.c diff --git a/nuttx/arch/arm/src/tiva/tiva_timerisr.c b/nuttx/arch/arm/src/tiva/tiva_timerisr.c index d579b491f..6f371a33a 100644 --- a/nuttx/arch/arm/src/tiva/tiva_timerisr.c +++ b/nuttx/arch/arm/src/tiva/tiva_timerisr.c @@ -105,7 +105,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 @@ -113,7 +113,7 @@ int up_timerisr(int irq, uint32_t *regs) * ****************************************************************************/ -void up_timerinit(void) +void up_timer_initialize(void) { uint32_t regval; |