sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Gregory Nutt 2014-08-06 16:26:01 -06:00
parent d4a29fcf7e
commit 594083d870
82 changed files with 358 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/8051/src/Makefile.sdccl
View File

@ -1,7 +1,7 @@
############################################################################
# arch/8051/src/Makefile.sdccl
#
# Copyright (C) 2007, 2008, 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2007, 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -63,8 +63,13 @@ AOBJS = $(ASRCS:$(ASMEXT)=$(OBJEXT))
CSRCS = up_initialize.c up_idle.c up_interruptcontext.c up_initialstate.c \
up_unblocktask.c up_blocktask.c up_releasepending.c \
up_reprioritizertr.c up_exit.c up_assert.c up_allocateheap.c \
up_irq.c up_savecontext.c up_restorecontext.c up_timerisr.c up_putc.c \
up_irq.c up_savecontext.c up_restorecontext.c up_putc.c \
up_debug.c up_delay.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CSRCS += up_timerisr.c
endif
COBJS = $(CSRCS:.c=$(OBJEXT))
# All sources and objcts

2
arch/8051/src/up_initialize.c
View File

@ -136,7 +136,7 @@ void up_initialize(void)
/* Initialize the system timer interrupt */
#ifndef CONFIG_ARCH_8051_SUPRESS_INTERRUPTS
up_timerinit();
up_timer_initialize();
#endif
board_led_on(LED_IRQSENABLED);

2
arch/8051/src/up_internal.h
View File

@ -117,7 +117,7 @@ void up_restoreregisters(FAR uint8_t *regs) _naked;
uint8_t up_savecontext(FAR struct xcptcontext *context) __naked;
void up_saveregisters(FAR uint8_t *regs) _naked;
void up_saveirqcontext(FAR struct xcptcontext *context);
void up_timerinit(void);
void up_timer_initialize(void);
/* Defined in up_debug.c */

4
arch/8051/src/up_timerisr.c
View File

@ -82,7 +82,7 @@ int up_timerisr(int irq, FAR uint8_t *frame)
}
/************************************************************************
* Function: up_timerinit
* Function: up_timer_initialize
*
* Description:
* This function is called during start-up to initialize
@ -90,7 +90,7 @@ int up_timerisr(int irq, FAR uint8_t *frame)
*
************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
#ifdef CONFIG_ARCH_8051_NOSYSTIMER
up_disable_irq(TIMER2_IRQ);

8
arch/arm/src/a1x/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################
# arch/arm/a1x/Make.defs
#
# Copyright (C) 2013 Gregory Nutt. All rights reserved.
# Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -101,4 +101,8 @@ CHIP_ASRCS =
# A1x-specific C source files
CHIP_CSRCS = a1x_boot.c a1x_irq.c a1x_pio.c a1x_timerisr.c a1x_lowputc.c a1x_serial.c
CHIP_CSRCS = a1x_boot.c a1x_irq.c a1x_pio.c a1x_lowputc.c a1x_serial.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += a1x_timerisr.c
endif

4
arch/arm/src/a1x/a1x_timerisr.c
View File

@ -107,7 +107,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
@ -115,7 +115,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint32_t regval;

15
arch/arm/src/c5471/Make.defs
View File

@ -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

4
arch/arm/src/c5471/c5471_timerisr.c
View File

@ -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;

28
arch/arm/src/calypso/Make.defs
View File

@ -38,15 +38,15 @@
HEAD_ASRC = calypso_head.S
CMN_ASRCS = up_saveusercontext.S up_fullcontextrestore.S up_vectors.S \
up_nommuhead.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_initialstate.c up_initialize.c \
up_interruptcontext.c up_prefetchabort.c up_releasepending.c \
up_releasestack.c up_reprioritizertr.c up_schedulesigaction.c \
up_sigdeliver.c up_syscall.c up_unblocktask.c \
up_undefinedinsn.c up_usestack.c calypso_power.c up_vfork.c
CMN_ASRCS = up_saveusercontext.S up_fullcontextrestore.S up_vectors.S
CMN_ASRCS += up_nommuhead.S vfork.S
CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c
CMN_CSRCS += up_createstack.c up_dataabort.c up_mdelay.c up_udelay.c
CMN_CSRCS += up_doirq.c up_exit.c up_idle.c up_initialstate.c up_initialize.c
CMN_CSRCS += up_interruptcontext.c up_prefetchabort.c up_releasepending.c
CMN_CSRCS += up_releasestack.c up_reprioritizertr.c up_schedulesigaction.c
CMN_CSRCS += up_sigdeliver.c up_syscall.c up_unblocktask.c
CMN_CSRCS += up_undefinedinsn.c up_usestack.c calypso_power.c up_vfork.c
ifeq ($(CONFIG_ELF),y)
CMN_CSRCS += up_elf.c
@ -56,6 +56,10 @@ ifeq ($(CONFIG_DEBUG_STACK),y)
CMN_CSRCS += up_checkstack.c
endif
CHIP_ASRCS = calypso_lowputc.S
CHIP_CSRCS = calypso_irq.c calypso_timer.c calypso_heap.c calypso_serial.c \
calypso_spi.c clock.c calypso_uwire.c calypso_armio.c calypso_keypad.c
CHIP_ASRCS = calypso_lowputc.S
CHIP_CSRCS = calypso_irq.c calypso_heap.c calypso_serial.c calypso_spi.c
CHIP_CSRCS += clock.c calypso_uwire.c calypso_armio.c calypso_keypad.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += calypso_timer.c
endif

4
arch/arm/src/calypso/calypso_timer.c
View File

@ -180,7 +180,7 @@ int up_timerisr(int irq, uint32_t *regs)
}
/************************************************************
* Function: up_timerinit
* Function: up_timer_initialize
*
* Description:
* Setup Calypso HW timer 2 to cause system ticks.
@ -190,7 +190,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
up_disable_irq(IRQ_SYSTIMER);

2
arch/arm/src/common/up_initialize.c
View File

@ -183,7 +183,7 @@ void up_initialize(void)
#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) && \
!defined(CONFIG_SYSTEMTICK_EXTCLK)
up_timerinit();
up_timer_initialize();
#endif
/* Register devices */

2
arch/arm/src/common/up_internal.h
View File

@ -418,7 +418,7 @@ void up_restorefpu(const uint32_t *regs);
/* System timer *************************************************************/
void up_timerinit(void);
void up_timer_initialize(void);
int up_timerisr(int irq, uint32_t *regs);
/* Low level serial output **************************************************/

18
arch/arm/src/dm320/Make.defs
View File

@ -33,11 +33,11 @@
#
############################################################################
HEAD_ASRC = up_head.S
HEAD_ASRC = up_head.S
CMN_ASRCS = up_cache.S up_fullcontextrestore.S up_saveusercontext.S \
CMN_ASRCS = up_cache.S up_fullcontextrestore.S up_saveusercontext.S \
up_vectors.S up_vectoraddrexcptn.S up_vectortab.S vfork.S
CMN_CSRCS = up_assert.c up_blocktask.c up_copyfullstate.c up_createstack.c \
CMN_CSRCS = up_assert.c up_blocktask.c up_copyfullstate.c up_createstack.c \
up_dataabort.c up_mdelay.c up_udelay.c up_exit.c up_idle.c \
up_initialize.c up_initialstate.c up_interruptcontext.c \
up_prefetchabort.c up_releasepending.c up_releasestack.c \
@ -53,10 +53,14 @@ ifeq ($(CONFIG_DEBUG_STACK),y)
CMN_CSRCS += up_checkstack.c
endif
CHIP_ASRCS = dm320_lowputc.S dm320_restart.S
CHIP_CSRCS = dm320_allocateheap.c dm320_boot.c dm320_decodeirq.c \
dm320_irq.c dm320_serial.c dm320_timerisr.c dm320_framebuffer.c
CHIP_ASRCS = dm320_lowputc.S dm320_restart.S
CHIP_CSRCS = dm320_allocateheap.c dm320_boot.c dm320_decodeirq.c \
dm320_irq.c dm320_serial.c dm320_framebuffer.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += dm320_timerisr.c
endif
ifeq ($(CONFIG_USBDEV),y)
CHIP_CSRCS += dm320_usbdev.c
CHIP_CSRCS += dm320_usbdev.c
endif

4
arch/arm/src/dm320/dm320_timerisr.c
View File

@ -126,7 +126,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
@ -134,7 +134,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
up_disable_irq(DM320_IRQ_SYSTIMER);

18
arch/arm/src/imx/Make.defs
View File

@ -33,11 +33,11 @@
#
############################################################################
HEAD_ASRC = up_head.S
HEAD_ASRC = up_head.S
CMN_ASRCS = up_cache.S up_fullcontextrestore.S up_saveusercontext.S \
CMN_ASRCS = up_cache.S up_fullcontextrestore.S up_saveusercontext.S \
up_vectors.S up_vectoraddrexcptn.S up_vectortab.S vfork.S
CMN_CSRCS = up_assert.c up_blocktask.c up_copyfullstate.c up_createstack.c \
CMN_CSRCS = up_assert.c up_blocktask.c up_copyfullstate.c up_createstack.c \
up_dataabort.c up_mdelay.c up_udelay.c up_exit.c up_idle.c \
up_initialize.c up_initialstate.c up_interruptcontext.c \
up_prefetchabort.c up_releasepending.c up_releasestack.c \
@ -53,10 +53,14 @@ ifeq ($(CONFIG_DEBUG_STACK),y)
CMN_CSRCS += up_checkstack.c
endif
CHIP_ASRCS = imx_lowputc.S
CHIP_CSRCS = imx_boot.c imx_gpio.c imx_allocateheap.c imx_irq.c \
imx_serial.c imx_timerisr.c imx_decodeirq.c imx_spi.c
CHIP_ASRCS = imx_lowputc.S
CHIP_CSRCS = imx_boot.c imx_gpio.c imx_allocateheap.c imx_irq.c \
imx_serial.c imx_decodeirq.c imx_spi.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += imx_timerisr.c
endif
ifeq ($(CONFIG_USBDEV),y)
CHIP_CSRCS += imx_usbdev.c
CHIP_CSRCS += imx_usbdev.c
endif

4
arch/arm/src/imx/imx_timerisr.c
View File

@ -100,7 +100,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
@ -108,7 +108,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint32_t tctl;

9
arch/arm/src/kinetis/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################
# arch/arm/src/kinetis/Make.defs
#
# Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
# Copyright (C) 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
@ -83,11 +83,14 @@ CHIP_ASRCS =
CHIP_CSRCS = kinetis_allocateheap.c kinetis_clockconfig.c
CHIP_CSRCS += kinetis_clrpend.c kinetis_idle.c kinetis_irq.c
CHIP_CSRCS += kinetis_lowputc.c kinetis_pin.c kinetis_pingpio.c
CHIP_CSRCS += kinetis_serial.c kinetis_start.c kinetis_timerisr.c
CHIP_CSRCS += kinetis_wdog.c
CHIP_CSRCS += kinetis_serial.c kinetis_start.c kinetis_wdog.c
# Configuration-dependent Kinetis files
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += kinetis_timerisr.c
endif
ifeq ($(CONFIG_NUTTX_KERNEL),y)
CHIP_CSRCS += kinetis_userspace.c kinetis_mpuinit.c
endif

4
arch/arm/src/kinetis/kinetis_timerisr.c
View File

@ -107,7 +107,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
@ -115,7 +115,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint32_t regval;

8
arch/arm/src/kl/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################
# arch/arm/src/kl/Make.defs
#
# Copyright (C) 2013 Gregory Nutt. All rights reserved.
# Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -69,7 +69,11 @@ endif
CHIP_ASRCS =
CHIP_CSRCS = kl_clockconfig.c kl_gpio.c kl_idle.c kl_irq.c kl_lowgetc.c
CHIP_CSRCS += kl_lowputc.c kl_serial.c kl_start.c kl_timerisr.c kl_cfmconfig.c
CHIP_CSRCS += kl_lowputc.c kl_serial.c kl_start.c kl_cfmconfig.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += kl_timerisr.c
endif
ifeq ($(CONFIG_NUTTX_KERNEL),y)
CHIP_CSRCS += kl_userspace.c

4
arch/arm/src/kl/kl_timerisr.c
View File

@ -122,7 +122,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
@ -130,7 +130,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint32_t regval;

6
arch/arm/src/lpc17xx/Make.defs
View File

@ -101,10 +101,14 @@ CHIP_ASRCS =
CHIP_CSRCS = lpc17_allocateheap.c lpc17_clockconfig.c lpc17_clrpend.c
CHIP_CSRCS += lpc17_gpio.c lpc17_i2c.c lpc17_idle.c lpc17_irq.c lpc17_lowputc.c
CHIP_CSRCS += lpc17_serial.c lpc17_spi.c lpc17_ssp.c lpc17_start.c lpc17_timerisr.c
CHIP_CSRCS += lpc17_serial.c lpc17_spi.c lpc17_ssp.c lpc17_start.c
# Configuration-dependent LPC17xx files
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += lpc17_timerisr.c
endif
ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
CHIP_ASRCS += lpc17_vectors.S
endif

4
arch/arm/src/lpc17xx/lpc17_timerisr.c
View File

@ -108,7 +108,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
@ -116,7 +116,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint32_t regval;

11
arch/arm/src/lpc214x/Make.defs
View File

@ -57,10 +57,13 @@ CMN_CSRCS += up_checkstack.c
endif
CHIP_ASRCS = lpc214x_lowputc.S
CHIP_CSRCS = lpc214x_decodeirq.c lpc214x_irq.c lpc214x_timerisr.c \
lpc214x_serial.c
CHIP_CSRCS = lpc214x_decodeirq.c lpc214x_irq.c lpc214x_serial.c
ifeq ($(CONFIG_USBDEV),y)
CHIP_CSRCS += lpc214x_usbdev.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += lpc214x_timerisr.c
endif
ifeq ($(CONFIG_USBDEV),y)
CHIP_CSRCS += lpc214x_usbdev.c
endif

4
arch/arm/src/lpc214x/lpc214x_timerisr.c
View File

@ -115,7 +115,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
@ -123,7 +123,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint16_t mcr;

6
arch/arm/src/lpc2378/Make.defs
View File

@ -62,9 +62,13 @@ CMN_CSRCS += up_checkstack.c
endif
CHIP_ASRCS = lpc23xx_lowputc.S
CHIP_CSRCS = lpc23xx_pllsetup.c lpc23xx_decodeirq.c lpc23xx_irq.c lpc23xx_timerisr.c \
CHIP_CSRCS = lpc23xx_pllsetup.c lpc23xx_decodeirq.c lpc23xx_irq.c \
lpc23xx_serial.c lpc23xx_io.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += lpc23xx_timerisr.c
endif
ifeq ($(CONFIG_LPC2378_SPI),y)
CHIP_CSRCS += lpc23xx_spi.c
endif

4
arch/arm/src/lpc2378/lpc23xx_timerisr.c
View File

@ -138,7 +138,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
@ -146,7 +146,7 @@ int up_timerisr(int irq, uint32_t * regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint16_t mcr;

6
arch/arm/src/lpc31xx/Make.defs
View File

@ -71,7 +71,11 @@ CHIP_ASRCS = $(CGU_ASRCS)
CHIP_CSRCS = lpc31_allocateheap.c lpc31_boot.c lpc31_decodeirq.c
CHIP_CSRCS += lpc31_irq.c lpc31_lowputc.c lpc31_serial.c lpc31_i2c.c
CHIP_CSRCS += lpc31_spi.c lpc31_timerisr.c $(CGU_CSRCS)
CHIP_CSRCS += lpc31_spi.c $(CGU_CSRCS)
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += lpc31_timerisr.c
endif
ifeq ($(CONFIG_LPC31_USBOTG),y)
ifeq ($(CONFIG_USBHOST),y)

4
arch/arm/src/lpc31xx/lpc31_timerisr.c
View File

@ -93,7 +93,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
@ -101,7 +101,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint32_t regval;
uint64_t load;

8
arch/arm/src/lpc43xx/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################
# arch/arm/src/lpc43xx/Make.defs
#
# Copyright (C) 2012-2013 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
@ -85,7 +85,11 @@ endif
CHIP_ASRCS =
CHIP_CSRCS = lpc43_allocateheap.c lpc43_cgu.c lpc43_clrpend.c lpc43_gpio.c
CHIP_CSRCS += lpc43_irq.c lpc43_pinconfig.c lpc43_rgu.c lpc43_serial.c
CHIP_CSRCS += lpc43_start.c lpc43_timerisr.c lpc43_uart.c
CHIP_CSRCS += lpc43_start.c lpc43_uart.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += lpc43_timerisr.c
endif
ifeq ($(CONFIG_NUTTX_KERNEL),y)
CHIP_CSRCS += lpc43_userspace.c lpc43_mpuinit.c

4
arch/arm/src/lpc43xx/lpc43_timerisr.c
View File

@ -107,7 +107,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
@ -115,7 +115,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint32_t regval;

8
arch/arm/src/nuc1xx/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################
# arch/arm/src/nuc1xx/Make.defs
#
# Copyright (C) 2013 Gregory Nutt. All rights reserved.
# Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -69,7 +69,11 @@ endif
CHIP_ASRCS =
CHIP_CSRCS = nuc_clockconfig.c nuc_gpio.c nuc_idle.c nuc_irq.c nuc_lowputc.c
CHIP_CSRCS += nuc_serial.c nuc_start.c nuc_timerisr.c
CHIP_CSRCS += nuc_serial.c nuc_start.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += nuc_timerisr.c
endif
ifeq ($(CONFIG_NUTTX_KERNEL),y)
CHIP_CSRCS += nuc_userspace.c

4
arch/arm/src/nuc1xx/nuc_timerisr.c
View File

@ -173,7 +173,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
@ -181,7 +181,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint32_t regval;

6
arch/arm/src/sam34/Make.defs
View File

@ -82,10 +82,14 @@ endif
CHIP_ASRCS =
CHIP_CSRCS = sam_allocateheap.c sam_gpioirq.c sam_irq.c sam_lowputc.c
CHIP_CSRCS += sam_serial.c sam_start.c sam_timerisr.c
CHIP_CSRCS += sam_serial.c sam_start.c
# Configuration-dependent SAM3/4 files
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += sam_timerisr.c
endif
ifeq ($(CONFIG_CRYPTO_AES),y)
CHIP_CSRCS += sam_aes.c
endif

4
arch/arm/src/sam34/sam_timerisr.c
View File

@ -129,7 +129,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
@ -137,7 +137,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint32_t regval;

6
arch/arm/src/sama5/Make.defs
View File

@ -105,10 +105,14 @@ CHIP_ASRCS =
CHIP_CSRCS = sam_allocateheap.c sam_boot.c sam_clockconfig.c sam_irq.c
CHIP_CSRCS += sam_lowputc.c sam_memories.c sam_pck.c sam_pio.c sam_pmc.c
CHIP_CSRCS += sam_sckc.c sam_serial.c sam_timerisr.c
CHIP_CSRCS += sam_sckc.c sam_serial.c
# Configuration dependent C and assembly language files
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += sam_timerisr.c
endif
ifeq ($(CONFIG_SAMA5_DMAC0),y)
CHIP_CSRCS += sam_dmac.c
else

4
arch/arm/src/sama5/sam_timerisr.c
View File

@ -118,7 +118,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
@ -126,7 +126,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint32_t regval;

6
arch/arm/src/samd/Make.defs
View File

@ -70,7 +70,11 @@ endif
CHIP_ASRCS =
CHIP_CSRCS = sam_clockconfig.c sam_idle.c sam_irq.c sam_lowputc.c
CHIP_CSRCS += sam_port.c sam_sercom.c sam_serial.c sam_start.c
CHIP_CSRCS += sam_timerisr.c sam_usart.c
CHIP_CSRCS += sam_usart.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += sam_timerisr.c
endif
ifeq ($(CONFIG_NUTTX_KERNEL),y)
CHIP_CSRCS += sam_userspace.c

4
arch/arm/src/samd/sam_timerisr.c
View File

@ -110,7 +110,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
@ -118,7 +118,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint32_t regval;

8
arch/arm/src/stm32/Make.defs
View File

@ -94,8 +94,12 @@ CHIP_ASRCS =
CHIP_CSRCS = stm32_allocateheap.c stm32_start.c stm32_rcc.c stm32_lse.c
CHIP_CSRCS += stm32_lsi.c stm32_gpio.c stm32_exti_gpio.c stm32_flash.c stm32_irq.c
CHIP_CSRCS += stm32_timerisr.c stm32_dma.c stm32_lowputc.c stm32_serial.c
CHIP_CSRCS += stm32_spi.c stm32_sdio.c stm32_tim.c stm32_waste.c stm32_ccm.c
CHIP_CSRCS += stm32_dma.c stm32_lowputc.c stm32_serial.c stm32_spi.c
CHIP_CSRCS += stm32_sdio.c stm32_tim.c stm32_waste.c stm32_ccm.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += stm32_timerisr.c
endif
ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
CHIP_ASRCS += stm32_vectors.S

4
arch/arm/src/stm32/stm32_timerisr.c
View File

@ -115,7 +115,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
@ -123,7 +123,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint32_t regval;

19
arch/arm/src/str71x/Make.defs
View File

@ -33,11 +33,11 @@
#
##############################################################################
HEAD_ASRC = str71x_head.S
HEAD_ASRC = str71x_head.S
CMN_ASRCS = up_saveusercontext.S up_fullcontextrestore.S up_vectors.S \
CMN_ASRCS = up_saveusercontext.S up_fullcontextrestore.S up_vectors.S \
vfork.S
CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c \
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_exit.c up_idle.c up_initialize.c up_initialstate.c \
up_interruptcontext.c up_prefetchabort.c up_releasepending.c \
@ -45,7 +45,7 @@ CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copyfullstate.c \
up_undefinedinsn.c up_usestack.c up_lowputs.c up_vfork.c
ifneq ($(CONFIG_DISABLE_SIGNALS),y)
CMN_CSRCS += up_schedulesigaction.c up_sigdeliver.c
CMN_CSRCS += up_schedulesigaction.c up_sigdeliver.c
endif
ifeq ($(CONFIG_ELF),y)
@ -56,13 +56,18 @@ ifeq ($(CONFIG_DEBUG_STACK),y)
CMN_CSRCS += up_checkstack.c
endif
CHIP_ASRCS =
CHIP_CSRCS = str71x_prccu.c str71x_lowputc.c str71x_decodeirq.c str71x_irq.c \
str71x_timerisr.c str71x_serial.c
CHIP_ASRCS =
CHIP_CSRCS = str71x_prccu.c str71x_lowputc.c str71x_decodeirq.c str71x_irq.c \
str71x_serial.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += str71x_timerisr.c
endif
ifeq ($(CONFIG_USBDEV),y)
CHIP_CSRCS += str71x_usbdev.c
endif
ifeq ($(CONFIG_STR71X_XTI),y)
CHIP_CSRCS += str71x_xti.c
endif

4
arch/arm/src/str71x/str71x_timerisr.c
View File

@ -156,7 +156,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
@ -164,7 +164,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
irqstate_t flags;

10
arch/arm/src/tiva/Make.defs
View File

@ -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

4
arch/arm/src/tiva/tiva_timerisr.c
View File

@ -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;

25
arch/avr/src/at32uc3/Make.defs
View File

@ -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

4
arch/avr/src/at32uc3/at32uc3_timerisr.c
View File

@ -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;

28
arch/avr/src/at90usb/Make.defs
View File

@ -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
ifeq ($(CONFIG_AVR_USBDEV),y)
CHIP_CSRCS += at90usb_usbdev.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += at90usb_timerisr.c
endif
ifeq ($(CONFIG_AVR_USBDEV),y)
CHIP_CSRCS += at90usb_usbdev.c
endif

4
arch/avr/src/at90usb/at90usb_timerisr.c
View File

@ -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.
*

26
arch/avr/src/atmega/Make.defs
View File

@ -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

4
arch/avr/src/atmega/atmega_timerisr.c
View File

@ -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.
*

2
arch/avr/src/common/up_initialize.c
View File

@ -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 */

2
arch/avr/src/common/up_internal.h
View File

@ -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 */

2
arch/hc/src/common/up_initialize.c
View File

@ -140,7 +140,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 */

2
arch/hc/src/common/up_internal.h
View File

@ -181,7 +181,7 @@ extern void up_sigdeliver(void);
/* System timer initialization */
extern void up_timerinit(void);
extern void up_timer_initialize(void);
extern int up_timerisr(int irq, uint32_t *regs);
/* Debug output */

18
arch/hc/src/m9s12/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################
# arch/arm/src/m9s12/Make.defs
#
# Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
# Copyright (C) 2009, 2011, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -33,18 +33,22 @@
#
############################################################################
HEAD_ASRC = m9s12_vectors.S
HEAD_ASRC = m9s12_vectors.S
CMN_ASRCS =
CMN_CSRCS = up_allocateheap.c up_blocktask.c up_copystate.c up_createstack.c \
CMN_ASRCS =
CMN_CSRCS = up_allocateheap.c up_blocktask.c up_copystate.c up_createstack.c \
up_doirq.c up_exit.c up_idle.c up_initialize.c up_interruptcontext.c \
up_mdelay.c up_modifyreg16.c up_modifyreg32.c up_modifyreg8.c \
up_puts.c up_releasepending.c up_releasestack.c up_reprioritizertr.c \
up_udelay.c up_unblocktask.c up_usestack.c
CHIP_ASRCS = m9s12_start.S m9s12_lowputc.S m9s12_saveusercontext.S
CHIP_CSRCS = m9s12_assert.c m9s12_gpio.c m9s12_gpioirq.c m9s12_initialstate.c \
m9s12_irq.c m9s12_serial.c m9s12_timerisr.c
CHIP_ASRCS = m9s12_start.S m9s12_lowputc.S m9s12_saveusercontext.S
CHIP_CSRCS = m9s12_assert.c m9s12_gpio.c m9s12_gpioirq.c m9s12_initialstate.c \
m9s12_irq.c m9s12_serial.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += m9s12_timerisr.c
endif
ifeq ($(CONFIG_DEBUG_GPIO),y)
CHIP_CSRCS += m9s12_dumpgpio.c

4
arch/hc/src/m9s12/m9s12_timerisr.c
View File

@ -152,7 +152,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 system timer
@ -160,7 +160,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint32_t tmp;
uint8_t regval;

2
arch/mips/src/common/up_initialize.c
View File

@ -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 */

2
arch/mips/src/common/up_internal.h
View File

@ -264,7 +264,7 @@ extern void up_serialinit(void);
/* System timer */
extern void up_timerinit(void);
extern void up_timer_initialize(void);
/* Network */

9
arch/mips/src/pic32mx/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################
# arch/mips/src/pic32mx/Make.defs
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -64,11 +64,14 @@ endif
CHIP_ASRCS =
CHIP_CSRCS = pic32mx-irq.c pic32mx-decodeirq.c pic32mx-exception.c pic32mx-gpio.c \
pic32mx-lowconsole.c pic32mx-lowinit.c pic32mx-serial.c pic32mx-spi.c \
pic32mx-timerisr.c
pic32mx-lowconsole.c pic32mx-lowinit.c pic32mx-serial.c pic32mx-spi.c
# Configuration-dependent PIC32MX files
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += pic32mx-timerisr.c
endif
ifeq ($(CONFIG_GPIO_IRQ),y)
CHIP_CSRCS += pic32mx_gpioirq.c
endif

4
arch/mips/src/pic32mx/pic32mx-timerisr.c
View File

@ -158,7 +158,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
@ -166,7 +166,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
/* Configure and enable TIMER1. Used the computed TCKPS divider and timer
* match valude. The source will be either the internal PBCLOCK (TCS=0) or

2
arch/sh/src/common/up_initialize.c
View File

@ -127,7 +127,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 */

2
arch/sh/src/common/up_internal.h
View File

@ -206,7 +206,7 @@ extern void up_wdtinit(void);
/* Defined in up_timerisr.c */
extern void up_timerinit(void);
extern void up_timer_initialize(void);
/* Defined in chip-specific logic if CONFIG_ARCH_NOINTC is not set */

20
arch/sh/src/m16c/Make.defs
View File

@ -1,7 +1,7 @@
##############################################################################
# arch/sh/src/m16c/Make.defs
#
# Copyright (C) 2009 Gregory Nutt. All rights reserved.
# Copyright (C) 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,21 +33,25 @@
#
##############################################################################
HEAD_ASRC = m16c_head.S
HEAD_ASRC = m16c_head.S
CMN_ASRCS =
CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c \
CMN_ASRCS =
CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c \
up_createstack.c up_doirq.c up_exit.c up_idle.c up_initialize.c \
up_interruptcontext.c up_lowputs.c up_mdelay.c up_puts.c \
up_releasepending.c up_releasestack.c up_reprioritizertr.c \
up_udelay.c up_unblocktask.c up_usestack.c
CHIP_ASRCS = m16c_vectors.S
CHIP_CSRCS = m16c_initialstate.c m16c_copystate.c m16c_lowputc.c m16c_irq.c \
m16c_timerisr.c m16c_serial.c m16c_dumpstate.c
CHIP_ASRCS = m16c_vectors.S
CHIP_CSRCS = m16c_initialstate.c m16c_copystate.c m16c_lowputc.c m16c_irq.c \
m16c_serial.c m16c_dumpstate.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += m16c_timerisr.c
endif
ifneq ($(CONFIG_DISABLE_SIGNALS),y)
CHIP_CSRCS += m16c_schedulesigaction.c m16c_sigdeliver.c
CHIP_CSRCS += m16c_schedulesigaction.c m16c_sigdeliver.c
endif

4
arch/sh/src/m16c/m16c_timerisr.c
View File

@ -136,7 +136,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
@ -144,7 +144,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
/* Make sure that no timers are running and that all timer interrupts are
* disabled.

30
arch/sh/src/sh1/Make.defs
View File

@ -1,7 +1,7 @@
##############################################################################
# arch/sh/src/sh1/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,24 +33,28 @@
#
##############################################################################
HEAD_ASRC = sh1_head.S
HEAD_ASRC = sh1_head.S
CMN_ASRCS =
CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c \
up_createstack.c up_doirq.c up_exit.c up_idle.c up_initialize.c \
up_initialstate.c up_interruptcontext.c up_lowputs.c \
up_mdelay.c up_puts.c up_releasepending.c up_releasestack.c \
up_reprioritizertr.c up_udelay.c up_unblocktask.c up_usestack.c
CMN_ASRCS =
CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c
CMN_CSRCS += up_createstack.c up_doirq.c up_exit.c up_idle.c up_initialize.c
CMN_CSRCS += up_initialstate.c up_interruptcontext.c up_lowputs.c
CMN_CSRCS += up_mdelay.c up_puts.c up_releasepending.c up_releasestack.c
CMN_CSRCS += up_reprioritizertr.c up_udelay.c up_unblocktask.c up_usestack.c
CHIP_ASRCS = sh1_vector.S sh1_saveusercontext.S
CHIP_CSRCS = sh1_lowputc.c sh1_irq.c sh1_timerisr.c sh1_serial.c \
sh1_initialstate.c sh1_copystate.c sh1_dumpstate.c
CHIP_ASRCS = sh1_vector.S sh1_saveusercontext.S
CHIP_CSRCS = sh1_lowputc.c sh1_irq.c sh1_serial.c sh1_initialstate.c
CHIP_CSRCS += sh1_copystate.c sh1_dumpstate.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += sh1_timerisr.c
endif
ifneq ($(CONFIG_DISABLE_SIGNALS),y)
CMN_CSRCS += sh1_schedulesigaction.c sh1_sigdeliver.c
CMN_CSRCS += sh1_schedulesigaction.c sh1_sigdeliver.c
endif
ifeq ($(CONFIG_USBDEV),y)
CHIP_CSRCS +=
CHIP_CSRCS +=
endif

4
arch/sh/src/sh1/sh1_timerisr.c
View File

@ -151,7 +151,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
@ -159,7 +159,7 @@ int up_timerisr(int irq, uint32_t *regs)
*
****************************************************************************/
void up_timerinit(void)
void up_timer_initialize(void)
{
uint8_t reg8;

2
arch/x86/src/common/up_initialize.c
View File

@ -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 */

2
arch/x86/src/common/up_internal.h
View File

@ -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 */

6
arch/x86/src/qemu/Make.defs
View File

@ -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

4
arch/x86/src/qemu/qemu_timerisr.c
View File

@ -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 */

2
arch/z16/src/common/up_initialize.c
View File

@ -146,7 +146,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 */

2
arch/z16/src/common/up_internal.h
View File

@ -176,7 +176,7 @@ extern void lowconsole_init(void);
/* Defined in up_timerisr.c */
extern void up_timerinit(void);
extern void up_timer_initialize(void);
/* Defined in up_irq.c */

6
arch/z16/src/z16f/Make.defs
View File

@ -44,7 +44,11 @@ CMN_CSRCS += up_unblocktask.c up_doirq.c up_releasepending.c up_usestack.c
CMN_CSRCS += up_exit.c up_releasestack.c up_idle.c up_reprioritizertr.c
CHIP_SSRCS = z16f_lowuart.S z16f_saveusercontext.S z16f_restoreusercontext.S
CHIP_CSRCS = z16f_clkinit.c z16f_sysexec.c z16f_irq.c z16f_timerisr.c z16f_serial.c
CHIP_CSRCS = z16f_clkinit.c z16f_sysexec.c z16f_irq.c z16f_serial.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += z16f_timerisr.c
endif
ifeq ($(CONFIG_Z16F_ESPI),y)
CHIP_CSRCS += z16f_espi.c

4
arch/z16/src/z16f/z16f_timerisr.c
View File

@ -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 reload;
uint32_t scaledfreq;

2
arch/z80/src/common/up_initialize.c
View File

@ -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

2
arch/z80/src/common/up_internal.h
View File

@ -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 */

28
arch/z80/src/ez80/Make.defs
View File

@ -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

4
arch/z80/src/ez80/ez80_timerisr.c
View File

@ -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;

5
arch/z80/src/z180/Make.defs
View File

@ -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

4
arch/z80/src/z180/z180_timerisr.c
View File

@ -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;

19
arch/z80/src/z8/Make.defs
View File

@ -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

4
arch/z80/src/z8/z8_timerisr.c
View File

@ -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;