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/x86 | |
| 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/x86')
| -rw-r--r-- | nuttx/arch/x86/src/common/up_initialize.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/x86/src/common/up_internal.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/x86/src/qemu/Make.defs | 6 | ||||
| -rw-r--r-- | nuttx/arch/x86/src/qemu/qemu_timerisr.c | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/nuttx/arch/x86/src/common/up_initialize.c b/nuttx/arch/x86/src/common/up_initialize.c index e5462a4b8..5a90b41ba 100644 --- a/nuttx/arch/x86/src/common/up_initialize.c +++ b/nuttx/arch/x86/src/common/up_initialize.c @@ -142,7 +142,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/x86/src/common/up_internal.h b/nuttx/arch/x86/src/common/up_internal.h index 4d6852fc2..56d5e6510 100644 --- a/nuttx/arch/x86/src/common/up_internal.h +++ b/nuttx/arch/x86/src/common/up_internal.h @@ -232,7 +232,7 @@ extern void up_wdtinit(void); /* Defined in up_timerisr.c */ -extern void up_timerinit(void); +extern void up_timer_initialize(void); /* Defined in up_irq.c */ diff --git a/nuttx/arch/x86/src/qemu/Make.defs b/nuttx/arch/x86/src/qemu/Make.defs index 63cee191f..86fe009ae 100644 --- a/nuttx/arch/x86/src/qemu/Make.defs +++ b/nuttx/arch/x86/src/qemu/Make.defs @@ -52,10 +52,14 @@ CMN_CSRCS += up_schedulesigaction.c up_unblocktask.c up_usestack.c CHIP_ASRCS = qemu_saveusercontext.S qemu_fullcontextrestore.S qemu_vectors.S CHIP_CSRCS = qemu_handlers.c qemu_idle.c qemu_lowputc.c qemu_lowsetup.c -CHIP_CSRCS += qemu_serial.c qemu_timerisr.c +CHIP_CSRCS += qemu_serial.c # Configuration-dependent QEMU files +ifneq ($(CONFIG_SCHED_TICKLESS),y) +CHIP_CSRCS += qemu_timerisr.c +endif + ifeq ($(CONFIG_QEMU_KEYPAD),y) CHIP_CSRCS += qemu_keypad.c endif diff --git a/nuttx/arch/x86/src/qemu/qemu_timerisr.c b/nuttx/arch/x86/src/qemu/qemu_timerisr.c index b363d2267..4ca7cf520 100644 --- a/nuttx/arch/x86/src/qemu/qemu_timerisr.c +++ b/nuttx/arch/x86/src/qemu/qemu_timerisr.c @@ -114,7 +114,7 @@ static 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 @@ -122,7 +122,7 @@ static int up_timerisr(int irq, uint32_t *regs) * ****************************************************************************/ -void up_timerinit(void) +void up_timer_initialize(void) { /* uint32_t to avoid compile time overflow errors */ |