diff --git a/arch/arm/src/a1x/a1x_timerisr.c b/arch/arm/src/a1x/a1x_timerisr.c index 0d62644f3ee..f6710363d81 100644 --- a/arch/arm/src/a1x/a1x_timerisr.c +++ b/arch/arm/src/a1x/a1x_timerisr.c @@ -103,7 +103,7 @@ static int a1x_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -111,7 +111,7 @@ static int a1x_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/am335x/am335x_timerisr.c b/arch/arm/src/am335x/am335x_timerisr.c index 7cddf0eeaed..47ac2493766 100644 --- a/arch/arm/src/am335x/am335x_timerisr.c +++ b/arch/arm/src/am335x/am335x_timerisr.c @@ -117,7 +117,7 @@ static int am335x_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -125,7 +125,7 @@ static int am335x_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/c5471/c5471_timerisr.c b/arch/arm/src/c5471/c5471_timerisr.c index 3a7bd19e967..48a3b14e75c 100644 --- a/arch/arm/src/c5471/c5471_timerisr.c +++ b/arch/arm/src/c5471/c5471_timerisr.c @@ -95,7 +95,7 @@ static int c5471_timerisr(int irq, uint32_t *regs, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -103,7 +103,7 @@ static int c5471_timerisr(int irq, uint32_t *regs, FAR void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t val; diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c index 42968e3b09e..7d307be5969 100644 --- a/arch/arm/src/common/up_initialize.c +++ b/arch/arm/src/common/up_initialize.c @@ -127,13 +127,6 @@ void up_initialize(void) up_addregion(); - /* Initialize the system timer interrupt */ - -#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) && \ - !defined(CONFIG_SYSTEMTICK_EXTCLK) - arm_timer_initialize(); -#endif - #ifdef CONFIG_PM /* Initialize the power management subsystem. This MCU-specific function * must be called *very* early in the initialization sequence *before* any diff --git a/arch/arm/src/common/up_internal.h b/arch/arm/src/common/up_internal.h index 5075cc74030..fcd30d054a8 100644 --- a/arch/arm/src/common/up_internal.h +++ b/arch/arm/src/common/up_internal.h @@ -429,10 +429,6 @@ void up_restorefpu(const uint32_t *regs); # define up_restorefpu(regs) #endif -/* System timer *************************************************************/ - -void arm_timer_initialize(void); - /* Low level serial output **************************************************/ void up_lowputc(char ch); diff --git a/arch/arm/src/cxd56xx/cxd56_timerisr.c b/arch/arm/src/cxd56xx/cxd56_timerisr.c index 41cf2745385..6411d957dd5 100644 --- a/arch/arm/src/cxd56xx/cxd56_timerisr.c +++ b/arch/arm/src/cxd56xx/cxd56_timerisr.c @@ -160,7 +160,7 @@ static int cxd56_timerisr(int irq, uint32_t *regs, FAR void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/dm320/dm320_timerisr.c b/arch/arm/src/dm320/dm320_timerisr.c index 936ecf04aa6..ca223e2b0b2 100644 --- a/arch/arm/src/dm320/dm320_timerisr.c +++ b/arch/arm/src/dm320/dm320_timerisr.c @@ -122,7 +122,7 @@ static int dm320_timerisr(int irq, uint32_t *regs, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -130,7 +130,7 @@ static int dm320_timerisr(int irq, uint32_t *regs, FAR void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { up_disable_irq(DM320_IRQ_SYSTIMER); diff --git a/arch/arm/src/efm32/efm32_timerisr.c b/arch/arm/src/efm32/efm32_timerisr.c index 6fcea93f8a8..a28c769fdec 100644 --- a/arch/arm/src/efm32/efm32_timerisr.c +++ b/arch/arm/src/efm32/efm32_timerisr.c @@ -99,7 +99,7 @@ static int efm32_timerisr(int irq, uint32_t *regs, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -107,7 +107,7 @@ static int efm32_timerisr(int irq, uint32_t *regs, FAR void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/imx1/imx_timerisr.c b/arch/arm/src/imx1/imx_timerisr.c index 4d39962bf99..f8c3c78fd97 100644 --- a/arch/arm/src/imx1/imx_timerisr.c +++ b/arch/arm/src/imx1/imx_timerisr.c @@ -92,7 +92,7 @@ static int imx_timerisr(int irq, uint32_t *regs, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -100,7 +100,7 @@ static int imx_timerisr(int irq, uint32_t *regs, FAR void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t tctl; diff --git a/arch/arm/src/imx6/imx_timerisr.c b/arch/arm/src/imx6/imx_timerisr.c index 2f48358a677..00ea290a0b0 100644 --- a/arch/arm/src/imx6/imx_timerisr.c +++ b/arch/arm/src/imx6/imx_timerisr.c @@ -153,7 +153,7 @@ static int imx_timerisr(int irq, uint32_t *regs, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -161,7 +161,7 @@ static int imx_timerisr(int irq, uint32_t *regs, FAR void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; uint32_t cr; diff --git a/arch/arm/src/imxrt/imxrt_timerisr.c b/arch/arm/src/imxrt/imxrt_timerisr.c index a62ded618ca..b3d33b933d2 100644 --- a/arch/arm/src/imxrt/imxrt_timerisr.c +++ b/arch/arm/src/imxrt/imxrt_timerisr.c @@ -198,7 +198,7 @@ static void up_pm_notify(struct pm_callback_s *cb, int domain, ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -206,7 +206,7 @@ static void up_pm_notify(struct pm_callback_s *cb, int domain, * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; #ifdef CONFIG_PM diff --git a/arch/arm/src/kinetis/kinetis_timerisr.c b/arch/arm/src/kinetis/kinetis_timerisr.c index 41631acbf29..cf4f5e4ac8e 100644 --- a/arch/arm/src/kinetis/kinetis_timerisr.c +++ b/arch/arm/src/kinetis/kinetis_timerisr.c @@ -103,7 +103,7 @@ static int kinetis_timerisr(int irq, uint32_t *regs, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -111,7 +111,7 @@ static int kinetis_timerisr(int irq, uint32_t *regs, FAR void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/kl/kl_timerisr.c b/arch/arm/src/kl/kl_timerisr.c index 11b282584a7..d5f06d8d7b4 100644 --- a/arch/arm/src/kl/kl_timerisr.c +++ b/arch/arm/src/kl/kl_timerisr.c @@ -118,7 +118,7 @@ static int kl_timerisr(int irq, uint32_t *regs, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -126,7 +126,7 @@ static int kl_timerisr(int irq, uint32_t *regs, FAR void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/lc823450/lc823450_timer.c b/arch/arm/src/lc823450/lc823450_timer.c index 188c7663bd1..3e11837fb03 100644 --- a/arch/arm/src/lc823450/lc823450_timer.c +++ b/arch/arm/src/lc823450/lc823450_timer.c @@ -470,10 +470,10 @@ static uint64_t up_get_timer_fraction(void) } /**************************************************************************** - * Name: arm_timer_initialize + * Name: up_timer_initialize ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { #ifdef CHECK_INTERVAL lc823450_gpio_config(TIMER_PIN | diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c index ff9faa12aa9..85faed2a019 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c @@ -104,7 +104,7 @@ static int lpc17_40_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -112,7 +112,7 @@ static int lpc17_40_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/lpc214x/lpc214x_timerisr.c b/arch/arm/src/lpc214x/lpc214x_timerisr.c index aa945f3ef79..250e05411a8 100644 --- a/arch/arm/src/lpc214x/lpc214x_timerisr.c +++ b/arch/arm/src/lpc214x/lpc214x_timerisr.c @@ -111,7 +111,7 @@ static int lpc214x_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -119,7 +119,7 @@ static int lpc214x_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint16_t mcr; diff --git a/arch/arm/src/lpc2378/lpc23xx_timerisr.c b/arch/arm/src/lpc2378/lpc23xx_timerisr.c index b4031191b21..79b48b860a5 100644 --- a/arch/arm/src/lpc2378/lpc23xx_timerisr.c +++ b/arch/arm/src/lpc2378/lpc23xx_timerisr.c @@ -134,7 +134,7 @@ static int lpc23xx_timerisr(int irq, uint32_t * regs, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -142,7 +142,7 @@ static int lpc23xx_timerisr(int irq, uint32_t * regs, FAR void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint16_t mcr; diff --git a/arch/arm/src/lpc31xx/lpc31_timerisr.c b/arch/arm/src/lpc31xx/lpc31_timerisr.c index 206c2512e80..539e8b58498 100644 --- a/arch/arm/src/lpc31xx/lpc31_timerisr.c +++ b/arch/arm/src/lpc31xx/lpc31_timerisr.c @@ -85,7 +85,7 @@ static int lpc31_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -93,7 +93,7 @@ static int lpc31_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; uint64_t load; diff --git a/arch/arm/src/lpc43xx/lpc43_rit.c b/arch/arm/src/lpc43xx/lpc43_rit.c index f8324c069cf..ed1741144be 100644 --- a/arch/arm/src/lpc43xx/lpc43_rit.c +++ b/arch/arm/src/lpc43xx/lpc43_rit.c @@ -154,7 +154,7 @@ static inline void lpc43_RIT_timer_stop(void) * Public Functions ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t ticks_per_int; uint32_t mask_bits = 0; diff --git a/arch/arm/src/lpc43xx/lpc43_tickless_rit.c b/arch/arm/src/lpc43xx/lpc43_tickless_rit.c index f55dbbf32a8..bf465ce233c 100644 --- a/arch/arm/src/lpc43xx/lpc43_tickless_rit.c +++ b/arch/arm/src/lpc43xx/lpc43_tickless_rit.c @@ -595,7 +595,7 @@ static int lpc43_tl_isr(int irq, FAR void *context, FAR void *arg) * Public Functions ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { irqstate_t flags; flags = enter_critical_section(); diff --git a/arch/arm/src/lpc43xx/lpc43_timerisr.c b/arch/arm/src/lpc43xx/lpc43_timerisr.c index 208c9df4671..cb5aa7ba92c 100644 --- a/arch/arm/src/lpc43xx/lpc43_timerisr.c +++ b/arch/arm/src/lpc43xx/lpc43_timerisr.c @@ -103,7 +103,7 @@ static int lpc43_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -111,7 +111,7 @@ static int lpc43_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/lpc54xx/lpc54_tickless.c b/arch/arm/src/lpc54xx/lpc54_tickless.c index 6d054f75937..d7963b12927 100644 --- a/arch/arm/src/lpc54xx/lpc54_tickless.c +++ b/arch/arm/src/lpc54xx/lpc54_tickless.c @@ -625,7 +625,7 @@ static int lpc54_tl_isr(int irq, FAR void *context, FAR void *arg) * Public Functions ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { irqstate_t flags; flags = enter_critical_section(); diff --git a/arch/arm/src/lpc54xx/lpc54_timerisr.c b/arch/arm/src/lpc54xx/lpc54_timerisr.c index c38a73a4e49..feeb0708f83 100644 --- a/arch/arm/src/lpc54xx/lpc54_timerisr.c +++ b/arch/arm/src/lpc54xx/lpc54_timerisr.c @@ -115,7 +115,7 @@ static int lpc54_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -123,7 +123,7 @@ static int lpc54_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/max326xx/common/max326_timerisr.c b/arch/arm/src/max326xx/common/max326_timerisr.c index d05de6a67b4..d97fcf3ec24 100644 --- a/arch/arm/src/max326xx/common/max326_timerisr.c +++ b/arch/arm/src/max326xx/common/max326_timerisr.c @@ -102,7 +102,7 @@ static int max326_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -110,7 +110,7 @@ static int max326_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/moxart/moxart_timer.c b/arch/arm/src/moxart/moxart_timer.c index 02c3d38b7b7..1606bf93cbd 100644 --- a/arch/arm/src/moxart/moxart_timer.c +++ b/arch/arm/src/moxart/moxart_timer.c @@ -121,7 +121,7 @@ static int moxart_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * Setup MoxaRT timer 0 to cause system ticks. @@ -131,7 +131,7 @@ static int moxart_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t tmp; diff --git a/arch/arm/src/nrf52/nrf52_timerisr.c b/arch/arm/src/nrf52/nrf52_timerisr.c index 0a9d2e981a5..d6e52e0f70a 100644 --- a/arch/arm/src/nrf52/nrf52_timerisr.c +++ b/arch/arm/src/nrf52/nrf52_timerisr.c @@ -113,7 +113,7 @@ static int nrf52_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -121,7 +121,7 @@ static int nrf52_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/nuc1xx/nuc_timerisr.c b/arch/arm/src/nuc1xx/nuc_timerisr.c index b6c630196f9..f2000c67ca2 100644 --- a/arch/arm/src/nuc1xx/nuc_timerisr.c +++ b/arch/arm/src/nuc1xx/nuc_timerisr.c @@ -169,7 +169,7 @@ static int nuc_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -177,7 +177,7 @@ static int nuc_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c b/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c index d67ffe24347..c1a90f51cef 100644 --- a/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c +++ b/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c @@ -105,7 +105,7 @@ static int s32k11x_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -113,7 +113,7 @@ static int s32k11x_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t coreclk; uint32_t reload; diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c index 3a1e3a56c3b..ea9815ffb19 100644 --- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c +++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c @@ -99,7 +99,7 @@ static int s32k14x_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -107,7 +107,7 @@ static int s32k14x_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t coreclk; uint32_t reload; diff --git a/arch/arm/src/sam34/sam4cm_tickless.c b/arch/arm/src/sam34/sam4cm_tickless.c index 6194bc89e3b..49b4c4d02b8 100644 --- a/arch/arm/src/sam34/sam4cm_tickless.c +++ b/arch/arm/src/sam34/sam4cm_tickless.c @@ -39,7 +39,7 @@ * is suppressed and the platform specific code is expected to provide the * following custom functions. * - * void arm_timer_initialize(void): Initializes the timer facilities. Called + * void up_timer_initialize(void): Initializes the timer facilities. Called * early in the initialization sequence (by up_initialize()). * int up_timer_gettime(FAR struct timespec *ts): Returns the current * time from the platform specific time source. @@ -206,7 +206,7 @@ static void sam_oneshot_handler(void *arg) ****************************************************************************/ /**************************************************************************** - * Name: arm_timer_initialize + * Name: up_timer_initialize * * Description: * Initializes all platform-specific timer facilities. This function is @@ -230,7 +230,7 @@ static void sam_oneshot_handler(void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { #ifdef CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP uint64_t max_delay; @@ -292,7 +292,7 @@ void arm_timer_initialize(void) * * Description: * Return the elapsed time since power-up (or, more correctly, since - * arm_timer_initialize() was called). This function is functionally + * up_timer_initialize() was called). This function is functionally * equivalent to: * * int clock_gettime(clockid_t clockid, FAR struct timespec *ts); diff --git a/arch/arm/src/sam34/sam_timerisr.c b/arch/arm/src/sam34/sam_timerisr.c index 9857438f186..a8477884421 100644 --- a/arch/arm/src/sam34/sam_timerisr.c +++ b/arch/arm/src/sam34/sam_timerisr.c @@ -125,7 +125,7 @@ static int sam_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -133,7 +133,7 @@ static int sam_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/sama5/sam_tickless.c b/arch/arm/src/sama5/sam_tickless.c index ff45b99ff66..1620242f0df 100644 --- a/arch/arm/src/sama5/sam_tickless.c +++ b/arch/arm/src/sama5/sam_tickless.c @@ -39,7 +39,7 @@ * is suppressed and the platform specific code is expected to provide the * following custom functions. * - * void arm_timer_initialize(void): Initializes the timer facilities. Called + * void up_timer_initialize(void): Initializes the timer facilities. Called * early in the initialization sequence (by up_initialize()). * int up_timer_gettime(FAR struct timespec *ts): Returns the current * time from the platform specific time source. @@ -218,7 +218,7 @@ static void sam_oneshot_handler(void *arg) ****************************************************************************/ /**************************************************************************** - * Name: arm_timer_initialize + * Name: up_timer_initialize * * Description: * Initializes all platform-specific timer facilities. This function is @@ -242,7 +242,7 @@ static void sam_oneshot_handler(void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { #ifdef CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP uint64_t max_delay; @@ -304,7 +304,7 @@ void arm_timer_initialize(void) * * Description: * Return the elapsed time since power-up (or, more correctly, since - * arm_timer_initialize() was called). This function is functionally + * up_timer_initialize() was called). This function is functionally * equivalent to: * * int clock_gettime(clockid_t clockid, FAR struct timespec *ts); diff --git a/arch/arm/src/sama5/sam_timerisr.c b/arch/arm/src/sama5/sam_timerisr.c index ca022416738..62dee48491f 100644 --- a/arch/arm/src/sama5/sam_timerisr.c +++ b/arch/arm/src/sama5/sam_timerisr.c @@ -114,7 +114,7 @@ static int sam_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -122,7 +122,7 @@ static int sam_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/samd2l2/sam_timerisr.c b/arch/arm/src/samd2l2/sam_timerisr.c index 8724af5eee2..0a359a37587 100644 --- a/arch/arm/src/samd2l2/sam_timerisr.c +++ b/arch/arm/src/samd2l2/sam_timerisr.c @@ -108,7 +108,7 @@ static int sam_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -116,7 +116,7 @@ static int sam_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/samd5e5/sam_timerisr.c b/arch/arm/src/samd5e5/sam_timerisr.c index af322d50633..cceebcf4a28 100644 --- a/arch/arm/src/samd5e5/sam_timerisr.c +++ b/arch/arm/src/samd5e5/sam_timerisr.c @@ -103,7 +103,7 @@ static int sam_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -111,7 +111,7 @@ static int sam_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/samv7/sam_tickless.c b/arch/arm/src/samv7/sam_tickless.c index 602002f2bec..f0ff80ae062 100644 --- a/arch/arm/src/samv7/sam_tickless.c +++ b/arch/arm/src/samv7/sam_tickless.c @@ -39,7 +39,7 @@ * is suppressed and the platform specific code is expected to provide the * following custom functions. * - * void arm_timer_initialize(void): Initializes the timer facilities. Called + * void up_timer_initialize(void): Initializes the timer facilities. Called * early in the initialization sequence (by up_initialize()). * int up_timer_gettime(FAR struct timespec *ts): Returns the current * time from the platform specific time source. @@ -230,7 +230,7 @@ static void sam_oneshot_handler(void *arg) ****************************************************************************/ /**************************************************************************** - * Name: arm_timer_initialize + * Name: up_timer_initialize * * Description: * Initializes all platform-specific timer facilities. This function is @@ -254,7 +254,7 @@ static void sam_oneshot_handler(void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { int ret; @@ -290,7 +290,7 @@ void arm_timer_initialize(void) * * Description: * Return the elapsed time since power-up (or, more correctly, since - * arm_timer_initialize() was called). This function is functionally + * up_timer_initialize() was called). This function is functionally * equivalent to: * * int clock_gettime(clockid_t clockid, FAR struct timespec *ts); diff --git a/arch/arm/src/samv7/sam_timerisr.c b/arch/arm/src/samv7/sam_timerisr.c index 5ae1982b613..abbdece5906 100644 --- a/arch/arm/src/samv7/sam_timerisr.c +++ b/arch/arm/src/samv7/sam_timerisr.c @@ -111,7 +111,7 @@ static int sam_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -119,7 +119,7 @@ static int sam_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/stm32/stm32_tickless.c b/arch/arm/src/stm32/stm32_tickless.c index 6c9edb6a14a..f3f9f5dcf80 100644 --- a/arch/arm/src/stm32/stm32_tickless.c +++ b/arch/arm/src/stm32/stm32_tickless.c @@ -41,7 +41,7 @@ * is suppressed and the platform specific code is expected to provide the * following custom functions. * - * void arm_timer_initialize(void): Initializes the timer facilities. + * void up_timer_initialize(void): Initializes the timer facilities. * Called early in the initialization sequence (by up_initialize()). * int up_timer_gettime(FAR struct timespec *ts): Returns the current * time from the platform specific time source. @@ -385,7 +385,7 @@ static int stm32_tickless_handler(int irq, void *context, void *arg) ****************************************************************************/ /**************************************************************************** - * Name: arm_timer_initialize + * Name: up_timer_initialize * * Description: * Initializes all platform-specific timer facilities. This function is @@ -409,7 +409,7 @@ static int stm32_tickless_handler(int irq, void *context, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { switch (CONFIG_STM32_TICKLESS_TIMER) { @@ -590,7 +590,7 @@ void arm_timer_initialize(void) * * Description: * Return the elapsed time since power-up (or, more correctly, since - * arm_timer_initialize() was called). This function is functionally + * up_timer_initialize() was called). This function is functionally * equivalent to: * * int clock_gettime(clockid_t clockid, FAR struct timespec *ts); diff --git a/arch/arm/src/stm32/stm32_timerisr.c b/arch/arm/src/stm32/stm32_timerisr.c index b553316c47d..143d6b74291 100644 --- a/arch/arm/src/stm32/stm32_timerisr.c +++ b/arch/arm/src/stm32/stm32_timerisr.c @@ -111,7 +111,7 @@ static int stm32_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -119,7 +119,7 @@ static int stm32_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/stm32f0l0g0/stm32_timerisr.c b/arch/arm/src/stm32f0l0g0/stm32_timerisr.c index 8cffbed8d94..d630fb1a9bb 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_timerisr.c +++ b/arch/arm/src/stm32f0l0g0/stm32_timerisr.c @@ -120,7 +120,7 @@ static int stm32_timerisr(int irq, uint32_t *regs, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -128,7 +128,7 @@ static int stm32_timerisr(int irq, uint32_t *regs, FAR void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/stm32f7/stm32_tickless.c b/arch/arm/src/stm32f7/stm32_tickless.c index 9cc8c190f40..6e9e6eefd7a 100644 --- a/arch/arm/src/stm32f7/stm32_tickless.c +++ b/arch/arm/src/stm32f7/stm32_tickless.c @@ -41,7 +41,7 @@ * is suppressed and the platform specific code is expected to provide the * following custom functions. * - * void arm_timer_initialize(void): Initializes the timer facilities. + * void up_timer_initialize(void): Initializes the timer facilities. * Called early in the initialization sequence (by up_initialize()). * int up_timer_gettime(FAR struct timespec *ts): Returns the current * time from the platform specific time source. @@ -398,7 +398,7 @@ static int stm32_tickless_handler(int irq, void *context, void *arg) ****************************************************************************/ /**************************************************************************** - * Name: arm_timer_initialize + * Name: up_timer_initialize * * Description: * Initializes all platform-specific timer facilities. This function is @@ -422,7 +422,7 @@ static int stm32_tickless_handler(int irq, void *context, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { switch (CONFIG_STM32F7_TICKLESS_TIMER) { @@ -604,7 +604,7 @@ void arm_timer_initialize(void) * * Description: * Return the elapsed time since power-up (or, more correctly, since - * arm_timer_initialize() was called). This function is functionally + * up_timer_initialize() was called). This function is functionally * equivalent to: * * int clock_gettime(clockid_t clockid, FAR struct timespec *ts); diff --git a/arch/arm/src/stm32f7/stm32_timerisr.c b/arch/arm/src/stm32f7/stm32_timerisr.c index 00657bf9dea..c3401514eca 100644 --- a/arch/arm/src/stm32f7/stm32_timerisr.c +++ b/arch/arm/src/stm32f7/stm32_timerisr.c @@ -117,7 +117,7 @@ static int stm32_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -125,7 +125,7 @@ static int stm32_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/stm32h7/stm32_timerisr.c b/arch/arm/src/stm32h7/stm32_timerisr.c index 027fbf36893..6c6c0199384 100644 --- a/arch/arm/src/stm32h7/stm32_timerisr.c +++ b/arch/arm/src/stm32h7/stm32_timerisr.c @@ -140,7 +140,7 @@ static int stm32_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -148,7 +148,7 @@ static int stm32_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/stm32l4/stm32l4_tickless.c b/arch/arm/src/stm32l4/stm32l4_tickless.c index 7518bbdb6a2..adab669bc3e 100644 --- a/arch/arm/src/stm32l4/stm32l4_tickless.c +++ b/arch/arm/src/stm32l4/stm32l4_tickless.c @@ -40,7 +40,7 @@ * is suppressed and the platform specific code is expected to provide the * following custom functions. * - * void arm_timer_initialize(void): Initializes the timer facilities. + * void up_timer_initialize(void): Initializes the timer facilities. * Called early in the initialization sequence (by up_initialize()). * int up_timer_gettime(FAR struct timespec *ts): Returns the current * time from the platform specific time source. @@ -163,7 +163,7 @@ static void stm32l4_oneshot_handler(FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: arm_timer_initialize + * Name: up_timer_initialize * * Description: * Initializes all platform-specific timer facilities. This function is @@ -187,7 +187,7 @@ static void stm32l4_oneshot_handler(FAR void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { #ifdef CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP uint64_t max_delay; @@ -245,7 +245,7 @@ void arm_timer_initialize(void) * * Description: * Return the elapsed time since power-up (or, more correctly, since - * arm_timer_initialize() was called). This function is functionally + * up_timer_initialize() was called). This function is functionally * equivalent to: * * int clock_gettime(clockid_t clockid, FAR struct timespec *ts); diff --git a/arch/arm/src/stm32l4/stm32l4_timerisr.c b/arch/arm/src/stm32l4/stm32l4_timerisr.c index 7972d80e1c5..1115a4fb72c 100644 --- a/arch/arm/src/stm32l4/stm32l4_timerisr.c +++ b/arch/arm/src/stm32l4/stm32l4_timerisr.c @@ -111,7 +111,7 @@ static int stm32l4_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -119,7 +119,7 @@ static int stm32l4_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/str71x/str71x_timerisr.c b/arch/arm/src/str71x/str71x_timerisr.c index 380736319c4..f27200169a3 100644 --- a/arch/arm/src/str71x/str71x_timerisr.c +++ b/arch/arm/src/str71x/str71x_timerisr.c @@ -146,7 +146,7 @@ static int str71x_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -154,7 +154,7 @@ static int str71x_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { irqstate_t flags; diff --git a/arch/arm/src/tiva/common/tiva_timerisr.c b/arch/arm/src/tiva/common/tiva_timerisr.c index a3e4e9bc886..8c07cf3b457 100644 --- a/arch/arm/src/tiva/common/tiva_timerisr.c +++ b/arch/arm/src/tiva/common/tiva_timerisr.c @@ -101,7 +101,7 @@ static int tiva_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -109,7 +109,7 @@ static int tiva_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/arm/src/tms570/tms570_timerisr.c b/arch/arm/src/tms570/tms570_timerisr.c index 33962249ef0..cb994723e07 100644 --- a/arch/arm/src/tms570/tms570_timerisr.c +++ b/arch/arm/src/tms570/tms570_timerisr.c @@ -147,7 +147,7 @@ static int tms570_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Name: arm_timer_initialize + * Name: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -155,7 +155,7 @@ static int tms570_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { /* Disable all RTI interrupts */ diff --git a/arch/arm/src/xmc4/xmc4_timerisr.c b/arch/arm/src/xmc4/xmc4_timerisr.c index c4165c34451..6a5053ca7c2 100644 --- a/arch/arm/src/xmc4/xmc4_timerisr.c +++ b/arch/arm/src/xmc4/xmc4_timerisr.c @@ -120,7 +120,7 @@ static int xmc4_timerisr(int irq, uint32_t *regs, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Function: arm_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -128,7 +128,7 @@ static int xmc4_timerisr(int irq, uint32_t *regs, FAR void *arg) * ****************************************************************************/ -void arm_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/avr/src/at32uc3/at32uc3_timerisr.c b/arch/avr/src/at32uc3/at32uc3_timerisr.c index f0e103d7874..7e0d850c204 100644 --- a/arch/avr/src/at32uc3/at32uc3_timerisr.c +++ b/arch/avr/src/at32uc3/at32uc3_timerisr.c @@ -174,7 +174,7 @@ static int at32uc3_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: avr_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -183,7 +183,7 @@ static int at32uc3_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void avr_timer_initialize(void) +void up_timer_initialize(void) { uint32_t regval; diff --git a/arch/avr/src/at90usb/at90usb_timerisr.c b/arch/avr/src/at90usb/at90usb_timerisr.c index e3ca902d64a..6a55ff75a1f 100644 --- a/arch/avr/src/at90usb/at90usb_timerisr.c +++ b/arch/avr/src/at90usb/at90usb_timerisr.c @@ -127,7 +127,7 @@ static int at90usb_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: avr_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -136,7 +136,7 @@ static int at90usb_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void avr_timer_initialize(void) +void up_timer_initialize(void) { /* Setup timer 1 compare match A to generate a tick interrupt. * diff --git a/arch/avr/src/atmega/atmega_timerisr.c b/arch/avr/src/atmega/atmega_timerisr.c index de8181cdf82..6cfa6e55949 100644 --- a/arch/avr/src/atmega/atmega_timerisr.c +++ b/arch/avr/src/atmega/atmega_timerisr.c @@ -127,7 +127,7 @@ static int atmega_timerisr(int irq, uint32_t *regs, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Function: avr_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -136,7 +136,7 @@ static int atmega_timerisr(int irq, uint32_t *regs, FAR void *arg) * ****************************************************************************/ -void avr_timer_initialize(void) +void up_timer_initialize(void) { /* Setup timer 1 compare match A to generate a tick interrupt. * diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c index 1e769bd2fc2..412d5f7c489 100644 --- a/arch/avr/src/common/up_initialize.c +++ b/arch/avr/src/common/up_initialize.c @@ -168,12 +168,6 @@ void up_initialize(void) up_addregion(); - /* Initialize the system timer interrupt */ - -#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) - avr_timer_initialize(); -#endif - #ifdef CONFIG_PM /* Initialize the power management subsystem. This MCU-specific function * must be called *very* early in the initialization sequence *before* any diff --git a/arch/avr/src/common/up_internal.h b/arch/avr/src/common/up_internal.h index 2bd68b64113..fa42ea361cb 100644 --- a/arch/avr/src/common/up_internal.h +++ b/arch/avr/src/common/up_internal.h @@ -167,10 +167,6 @@ void lowconsole_init(void); # define lowconsole_init() #endif -/* Defined in chip/xxx_timerisr.c */ - -void avr_timer_initialize(void); - /* Defined in chip/xxx_ethernet.c */ #if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c index a12b286f344..06ed0766740 100644 --- a/arch/hc/src/common/up_initialize.c +++ b/arch/hc/src/common/up_initialize.c @@ -90,12 +90,6 @@ void up_initialize(void) up_addregion(); - /* Initialize the system timer interrupt */ - -#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) - hc_timer_initialize(); -#endif - #ifdef CONFIG_PM /* Initialize the power management subsystem. This MCU-specific function * must be called *very* early in the initialization sequence *before* any diff --git a/arch/hc/src/common/up_internal.h b/arch/hc/src/common/up_internal.h index bf16dfa96d9..b8847ea63b6 100644 --- a/arch/hc/src/common/up_internal.h +++ b/arch/hc/src/common/up_internal.h @@ -156,10 +156,6 @@ uint8_t *up_doirq(int irq, uint8_t *regs); void up_sigdeliver(void); -/* System timer initialization */ - -void hc_timer_initialize(void); - /* Debug output */ void up_earlyserialinit(void); diff --git a/arch/hc/src/m9s12/m9s12_timerisr.c b/arch/hc/src/m9s12/m9s12_timerisr.c index 9cbcc9703b5..9b10f4e72f3 100644 --- a/arch/hc/src/m9s12/m9s12_timerisr.c +++ b/arch/hc/src/m9s12/m9s12_timerisr.c @@ -148,7 +148,7 @@ static int m9s12_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: hc_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the system timer @@ -156,7 +156,7 @@ static int m9s12_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void hc_timer_initialize(void) +void up_timer_initialize(void) { uint32_t tmp; uint8_t regval; diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c index e433bc474ee..25c4a17d2e0 100644 --- a/arch/mips/src/common/up_initialize.c +++ b/arch/mips/src/common/up_initialize.c @@ -92,12 +92,6 @@ void up_initialize(void) up_addregion(); - /* Initialize the system timer interrupt */ - -#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) - mips_timer_initialize(); -#endif - #ifdef CONFIG_PM /* Initialize the power management subsystem. This MCU-specific function * must be called *very* early in the initialization sequence *before* any diff --git a/arch/mips/src/common/up_internal.h b/arch/mips/src/common/up_internal.h index b7fb134b470..4fa8eacbf4a 100644 --- a/arch/mips/src/common/up_internal.h +++ b/arch/mips/src/common/up_internal.h @@ -260,10 +260,6 @@ void up_serialinit(void); void rpmsg_serialinit(void); -/* System timer */ - -void mips_timer_initialize(void); - /* Network */ #if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) diff --git a/arch/mips/src/pic32mx/pic32mx-timerisr.c b/arch/mips/src/pic32mx/pic32mx-timerisr.c index a2c3352d2f8..fce64d7ef0b 100644 --- a/arch/mips/src/pic32mx/pic32mx-timerisr.c +++ b/arch/mips/src/pic32mx/pic32mx-timerisr.c @@ -154,7 +154,7 @@ static int pc32mx_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: mips_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -162,7 +162,7 @@ static int pc32mx_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void mips_timer_initialize(void) +void up_timer_initialize(void) { /* Configure and enable TIMER1. Used the computed TCKPS divider and timer * match value. The source will be either the internal PBCLOCK (TCS=0) or diff --git a/arch/mips/src/pic32mz/pic32mz-timerisr.c b/arch/mips/src/pic32mz/pic32mz-timerisr.c index b9df52c5553..fbc32c79563 100644 --- a/arch/mips/src/pic32mz/pic32mz-timerisr.c +++ b/arch/mips/src/pic32mz/pic32mz-timerisr.c @@ -153,7 +153,7 @@ static int pc32mz_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: mips_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -161,7 +161,7 @@ static int pc32mz_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void mips_timer_initialize(void) +void up_timer_initialize(void) { /* Configure and enable TIMER1. Used the computed TCKPS divider and timer * match value. The source will be either the internal PBCLOCK (TCS=0) or diff --git a/arch/misoc/src/common/misoc.h b/arch/misoc/src/common/misoc.h index 564ff123fa7..f225b936cb4 100644 --- a/arch/misoc/src/common/misoc.h +++ b/arch/misoc/src/common/misoc.h @@ -63,16 +63,6 @@ #ifndef __ASSEMBLY__ -/**************************************************************************** - * Name: misoc_timer_initialize - * - * Description: - * Initialize and start the system timer. - * - ****************************************************************************/ - -void misoc_timer_initialize(void); - /**************************************************************************** * Name: flush_cpu_dcache * diff --git a/arch/misoc/src/common/misoc_timerisr.c b/arch/misoc/src/common/misoc_timerisr.c index da9d38638ff..30c845a524e 100644 --- a/arch/misoc/src/common/misoc_timerisr.c +++ b/arch/misoc/src/common/misoc_timerisr.c @@ -108,7 +108,7 @@ int misoc_timer_isr(int irq, void *context, void *arg) } /**************************************************************************** - * Function: misoc_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -116,7 +116,7 @@ int misoc_timer_isr(int irq, void *context, void *arg) * ****************************************************************************/ -void misoc_timer_initialize(void) +void up_timer_initialize(void) { /* Clear event pending */ diff --git a/arch/misoc/src/lm32/lm32_initialize.c b/arch/misoc/src/lm32/lm32_initialize.c index 73349e39c2d..9e00ebf9aea 100644 --- a/arch/misoc/src/lm32/lm32_initialize.c +++ b/arch/misoc/src/lm32/lm32_initialize.c @@ -75,10 +75,6 @@ void up_initialize(void) rpmsg_serialinit(); #endif - /* Initialize the system timer */ - - misoc_timer_initialize(); - #ifdef CONFIG_MM_IOB /* Initialize IO buffering */ diff --git a/arch/misoc/src/minerva/minerva_initialize.c b/arch/misoc/src/minerva/minerva_initialize.c index 45cde5c89e5..1bf78499feb 100644 --- a/arch/misoc/src/minerva/minerva_initialize.c +++ b/arch/misoc/src/minerva/minerva_initialize.c @@ -75,10 +75,6 @@ void up_initialize(void) rpmsg_serialinit(); #endif - /* Initialize the system timer */ - - misoc_timer_initialize(); - #ifdef CONFIG_MM_IOB /* Initialize IO buffering */ diff --git a/arch/or1k/src/common/up_initialize.c b/arch/or1k/src/common/up_initialize.c index 783415e018e..00143028fee 100644 --- a/arch/or1k/src/common/up_initialize.c +++ b/arch/or1k/src/common/up_initialize.c @@ -185,13 +185,6 @@ void up_initialize(void) up_addregion(); - /* Initialize the system timer interrupt */ - -#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) && \ - !defined(CONFIG_SYSTEMTICK_EXTCLK) - or1k_timer_initialize(); -#endif - #ifdef CONFIG_PM /* Initialize the power management subsystem. This MCU-specific function * must be called *very* early in the initialization sequence *before* any diff --git a/arch/or1k/src/common/up_internal.h b/arch/or1k/src/common/up_internal.h index 40d6ea6c2eb..da5ae50db0d 100644 --- a/arch/or1k/src/common/up_internal.h +++ b/arch/or1k/src/common/up_internal.h @@ -283,10 +283,6 @@ uint32_t *or1k_doirq(int irq, uint32_t *regs); uint32_t *or1k_syscall(uint32_t *regs); -/* System timer *************************************************************/ - -void or1k_timer_initialize(void); - /* Low level serial output **************************************************/ void up_lowputc(char ch); diff --git a/arch/or1k/src/common/up_timer.c b/arch/or1k/src/common/up_timer.c index 360936f0a9f..5411a03c4d0 100644 --- a/arch/or1k/src/common/up_timer.c +++ b/arch/or1k/src/common/up_timer.c @@ -86,14 +86,14 @@ static int or1k_timer_isr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Name: or1k_timer_initialize + * Name: up_timer_initialize * * Description: * Initialize the OpenRISC Tick Timer unit * ****************************************************************************/ -void or1k_timer_initialize(void) +void up_timer_initialize(void) { uint32_t ttmr = TTMR_LOAD; diff --git a/arch/renesas/src/common/up_initialize.c b/arch/renesas/src/common/up_initialize.c index 13534800e3e..803daa71ea8 100644 --- a/arch/renesas/src/common/up_initialize.c +++ b/arch/renesas/src/common/up_initialize.c @@ -86,12 +86,6 @@ void up_initialize(void) g_current_regs = NULL; -#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) - /* Initialize the system timer interrupt */ - - renesas_timer_initialize(); -#endif - #ifdef CONFIG_PM /* Initialize the power management subsystem. This MCU-specific function * must be called *very* early in the initialization sequence *before* any diff --git a/arch/renesas/src/common/up_internal.h b/arch/renesas/src/common/up_internal.h index 077805b8927..17fa6071490 100644 --- a/arch/renesas/src/common/up_internal.h +++ b/arch/renesas/src/common/up_internal.h @@ -185,10 +185,6 @@ void lowconsole_init(void); void up_wdtinit(void); -/* Defined in xyz_timerisr.c */ - -void renesas_timer_initialize(void); - /* Defined in board/xyz_lcd.c */ #ifdef CONFIG_SLCD_CONSOLE diff --git a/arch/renesas/src/m16c/m16c_timerisr.c b/arch/renesas/src/m16c/m16c_timerisr.c index 29d404adbe9..96c3d02ca90 100644 --- a/arch/renesas/src/m16c/m16c_timerisr.c +++ b/arch/renesas/src/m16c/m16c_timerisr.c @@ -132,7 +132,7 @@ static int m16c_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: renesas_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -140,7 +140,7 @@ static int m16c_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void renesas_timer_initialize(void) +void up_timer_initialize(void) { /* Make sure that no timers are running and that all timer interrupts are * disabled. diff --git a/arch/renesas/src/rx65n/rx65n_timerisr.c b/arch/renesas/src/rx65n/rx65n_timerisr.c index 54ccac9ea4c..a81106e38b9 100644 --- a/arch/renesas/src/rx65n/rx65n_timerisr.c +++ b/arch/renesas/src/rx65n/rx65n_timerisr.c @@ -111,7 +111,7 @@ static int rx65n_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: renesas_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -119,7 +119,7 @@ static int rx65n_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void renesas_timer_initialize(void) +void up_timer_initialize(void) { uint16_t reg16; uint32_t reg32; diff --git a/arch/renesas/src/sh1/sh1_timerisr.c b/arch/renesas/src/sh1/sh1_timerisr.c index d1ecbaaf0f4..d32bb5ae629 100644 --- a/arch/renesas/src/sh1/sh1_timerisr.c +++ b/arch/renesas/src/sh1/sh1_timerisr.c @@ -147,7 +147,7 @@ static int sh1_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: renesas_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -155,7 +155,7 @@ static int sh1_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void renesas_timer_initialize(void) +void up_timer_initialize(void) { uint8_t reg8; diff --git a/arch/risc-v/src/common/up_initialize.c b/arch/risc-v/src/common/up_initialize.c index 3ebd0ae8a2c..5c25e5b85d3 100644 --- a/arch/risc-v/src/common/up_initialize.c +++ b/arch/risc-v/src/common/up_initialize.c @@ -114,13 +114,6 @@ void up_initialize(void) up_addregion(); - /* Initialize the system timer interrupt */ - -#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) && \ - !defined(CONFIG_SYSTEMTICK_EXTCLK) - riscv_timer_initialize(); -#endif - #ifdef CONFIG_MM_IOB /* Initialize IO buffering */ diff --git a/arch/risc-v/src/common/up_internal.h b/arch/risc-v/src/common/up_internal.h index 768fc81614b..26e134379c1 100644 --- a/arch/risc-v/src/common/up_internal.h +++ b/arch/risc-v/src/common/up_internal.h @@ -188,10 +188,6 @@ void up_sigdeliver(void); int up_swint(int irq, FAR void *context, FAR void *arg); uint32_t up_get_newintctx(void); -/* System timer *************************************************************/ - -void riscv_timer_initialize(void); - /* Low level serial output **************************************************/ void up_lowputc(char ch); diff --git a/arch/risc-v/src/fe310/fe310_timerisr.c b/arch/risc-v/src/fe310/fe310_timerisr.c index 066671a716b..0a4f18e7a73 100644 --- a/arch/risc-v/src/fe310/fe310_timerisr.c +++ b/arch/risc-v/src/fe310/fe310_timerisr.c @@ -120,7 +120,7 @@ static int fe310_timerisr(int irq, void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: riscv_timer_initialize + * Name: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -128,7 +128,7 @@ static int fe310_timerisr(int irq, void *context, FAR void *arg) * ****************************************************************************/ -void riscv_timer_initialize(void) +void up_timer_initialize(void) { /* Attach timer interrupt handler */ diff --git a/arch/risc-v/src/gap8/gap8_tim.c b/arch/risc-v/src/gap8/gap8_tim.c index ab01224a714..288c7e1e1c1 100644 --- a/arch/risc-v/src/gap8/gap8_tim.c +++ b/arch/risc-v/src/gap8/gap8_tim.c @@ -93,7 +93,7 @@ static int gap8_timisr(int irq, void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: riscv_timer_initialize + * Name: up_timer_initialize * * Description: * Initialize the timer based on the frequency of source clock and ticks @@ -101,7 +101,7 @@ static int gap8_timisr(int irq, void *context, FAR void *arg) * ****************************************************************************/ -void riscv_timer_initialize(void) +void up_timer_initialize(void) { /* Set input clock to 1MHz. FC won't exceed 250MHz */ diff --git a/arch/risc-v/src/k210/k210_timerisr.c b/arch/risc-v/src/k210/k210_timerisr.c index f5c19e41ead..c10e3988b49 100644 --- a/arch/risc-v/src/k210/k210_timerisr.c +++ b/arch/risc-v/src/k210/k210_timerisr.c @@ -122,7 +122,7 @@ static int k210_timerisr(int irq, void *context, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Name: riscv_timer_initialize + * Name: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -130,7 +130,7 @@ static int k210_timerisr(int irq, void *context, FAR void *arg) * ****************************************************************************/ -void riscv_timer_initialize(void) +void up_timer_initialize(void) { #if 1 /* Attach timer interrupt handler */ diff --git a/arch/risc-v/src/nr5m100/nr5_timerisr.c b/arch/risc-v/src/nr5m100/nr5_timerisr.c index a1f31bd39af..be2e05f7dfc 100644 --- a/arch/risc-v/src/nr5m100/nr5_timerisr.c +++ b/arch/risc-v/src/nr5m100/nr5_timerisr.c @@ -129,7 +129,7 @@ uint64_t up_get_systick(void) } /**************************************************************************** - * Function: riscv_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -137,7 +137,7 @@ uint64_t up_get_systick(void) * ****************************************************************************/ -void riscv_timer_initialize(void) +void up_timer_initialize(void) { /* Set the SysTick interrupt to the default priority */ diff --git a/arch/sim/src/sim/up_initialize.c b/arch/sim/src/sim/up_initialize.c index 94a586ff998..6a52c2a47d4 100644 --- a/arch/sim/src/sim/up_initialize.c +++ b/arch/sim/src/sim/up_initialize.c @@ -296,3 +296,16 @@ void up_initialize(void) up_init_smartfs(); #endif } + +/**************************************************************************** + * Function: up_timer_initialize + * + * Description: + * This function is called during start-up to initialize + * the timer hardware. + * + ****************************************************************************/ + +void up_timer_initialize(void) +{ +} diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c index e675e8bff4b..81fcd7f7701 100644 --- a/arch/x86/src/common/up_initialize.c +++ b/arch/x86/src/common/up_initialize.c @@ -92,12 +92,6 @@ void up_initialize(void) up_addregion(); - /* Initialize the system timer interrupt */ - -#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) - x86_timer_initialize(); -#endif - #ifdef CONFIG_PM /* Initialize the power management subsystem. This MCU-specific function * must be called *very* early in the initialization sequence *before* any diff --git a/arch/x86/src/common/up_internal.h b/arch/x86/src/common/up_internal.h index 0c1cb3a691d..e4a9bbc5f8a 100644 --- a/arch/x86/src/common/up_internal.h +++ b/arch/x86/src/common/up_internal.h @@ -222,10 +222,6 @@ void lowconsole_init(void); void up_wdtinit(void); -/* Defined in xyz_timerisr.c */ - -void x86_timer_initialize(void); - /* Defined in board/up_network.c */ #if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) diff --git a/arch/x86/src/qemu/qemu_timerisr.c b/arch/x86/src/qemu/qemu_timerisr.c index aca0a2e0824..5cd9d647f38 100644 --- a/arch/x86/src/qemu/qemu_timerisr.c +++ b/arch/x86/src/qemu/qemu_timerisr.c @@ -106,7 +106,7 @@ static int qemu_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: x86_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -114,7 +114,7 @@ static int qemu_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void x86_timer_initialize(void) +void up_timer_initialize(void) { /* uint32_t to avoid compile time overflow errors */ diff --git a/arch/xtensa/src/common/xtensa.h b/arch/xtensa/src/common/xtensa.h index 1c3190ab05d..b8edff01ae7 100644 --- a/arch/xtensa/src/common/xtensa.h +++ b/arch/xtensa/src/common/xtensa.h @@ -333,10 +333,6 @@ void xtensa_serial_initialize(void); void rpmsg_serialinit(void); -/* System timer */ - -void xtensa_timer_initialize(void); - /* Network */ #if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT) diff --git a/arch/xtensa/src/common/xtensa_initialize.c b/arch/xtensa/src/common/xtensa_initialize.c index 015bbed7c66..8f4183eaece 100644 --- a/arch/xtensa/src/common/xtensa_initialize.c +++ b/arch/xtensa/src/common/xtensa_initialize.c @@ -100,12 +100,6 @@ void up_initialize(void) xtensa_add_region(); -#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) - /* Initialize the system timer interrupt */ - - xtensa_timer_initialize(); -#endif - #ifdef CONFIG_PM /* Initialize the power management subsystem. This MCU-specific function * must be called *very* early in the initialization sequence *before* any diff --git a/arch/xtensa/src/esp32/esp32_timerisr.c b/arch/xtensa/src/esp32/esp32_timerisr.c index e094c91dab0..2a1a840fc84 100644 --- a/arch/xtensa/src/esp32/esp32_timerisr.c +++ b/arch/xtensa/src/esp32/esp32_timerisr.c @@ -160,7 +160,7 @@ static int esp32_timerisr(int irq, uint32_t *regs, FAR void *arg) ****************************************************************************/ /**************************************************************************** - * Function: xtensa_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -168,7 +168,7 @@ static int esp32_timerisr(int irq, uint32_t *regs, FAR void *arg) * ****************************************************************************/ -void xtensa_timer_initialize(void) +void up_timer_initialize(void) { uint32_t divisor; uint32_t count; diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c index a61a9105a02..605693bbfb9 100644 --- a/arch/z16/src/common/up_initialize.c +++ b/arch/z16/src/common/up_initialize.c @@ -105,12 +105,6 @@ void up_initialize(void) up_addregion(); #endif -#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) - /* Initialize the system timer interrupt */ - - z16_timer_initialize(); -#endif - #ifdef CONFIG_PM /* Initialize the power management subsystem. This MCU-specific function * must be called *very* early in the initialization sequence *before* any diff --git a/arch/z16/src/common/up_internal.h b/arch/z16/src/common/up_internal.h index 34a7400fcc0..c1e922f31e5 100644 --- a/arch/z16/src/common/up_internal.h +++ b/arch/z16/src/common/up_internal.h @@ -167,10 +167,6 @@ void rpmsg_serialinit(void); void lowconsole_init(void); #endif -/* Defined in xyz_timerisr.c */ - -void z16_timer_initialize(void); - /* Defined in xyz_irq.c */ void up_ack_irq(int irq); diff --git a/arch/z16/src/z16f/z16f_timerisr.c b/arch/z16/src/z16f/z16f_timerisr.c index 0e49e66a969..c827148ca7c 100644 --- a/arch/z16/src/z16f/z16f_timerisr.c +++ b/arch/z16/src/z16f/z16f_timerisr.c @@ -95,7 +95,7 @@ static int z16f_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: z16_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize @@ -103,7 +103,7 @@ static int z16f_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void z16_timer_initialize(void) +void up_timer_initialize(void) { uint32_t reload; uint32_t scaledfreq; diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c index 50863653339..80637d7d0b0 100644 --- a/arch/z80/src/common/up_initialize.c +++ b/arch/z80/src/common/up_initialize.c @@ -96,12 +96,6 @@ void up_initialize(void) up_addregion(); #endif -#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) - /* Initialize the system timer interrupt */ - - z80_timer_initialize(); -#endif - #ifdef CONFIG_PM /* Initialize the power management subsystem. This MCU-specific function * must be called *very* early in the initialization sequence *before* any diff --git a/arch/z80/src/common/z80_internal.h b/arch/z80/src/common/z80_internal.h index 672583cfac4..5b488c04c66 100644 --- a/arch/z80/src/common/z80_internal.h +++ b/arch/z80/src/common/z80_internal.h @@ -164,10 +164,6 @@ void ramlog_consoleinit(void); void up_puts(const char *str); -/* Defined in xyz_timerisr.c */ - -void z80_timer_initialize(void); - /* Architecture specific hook into the timer interrupt handler */ #ifdef CONFIG_ARCH_TIMERHOOK diff --git a/arch/z80/src/ez80/ez80_timerisr.c b/arch/z80/src/ez80/ez80_timerisr.c index 235697c4616..7cc464e900a 100644 --- a/arch/z80/src/ez80/ez80_timerisr.c +++ b/arch/z80/src/ez80/ez80_timerisr.c @@ -92,7 +92,7 @@ static int ez80_timerisr(int irq, chipreg_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: z80_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -100,7 +100,7 @@ static int ez80_timerisr(int irq, chipreg_t *regs, void *arg) * ****************************************************************************/ -void z80_timer_initialize(void) +void up_timer_initialize(void) { uint16_t reload; diff --git a/arch/z80/src/z180/z180_timerisr.c b/arch/z80/src/z180/z180_timerisr.c index 1b65840fccf..e85ff990642 100644 --- a/arch/z80/src/z180/z180_timerisr.c +++ b/arch/z80/src/z180/z180_timerisr.c @@ -106,7 +106,7 @@ static int z180_timerisr(int irq, chipreg_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: z80_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -114,7 +114,7 @@ static int z180_timerisr(int irq, chipreg_t *regs, void *arg) * ****************************************************************************/ -void z80_timer_initialize(void) +void up_timer_initialize(void) { uint8_t regval; diff --git a/arch/z80/src/z8/z8_timerisr.c b/arch/z80/src/z8/z8_timerisr.c index 661291e52d0..c0d53717623 100644 --- a/arch/z80/src/z8/z8_timerisr.c +++ b/arch/z80/src/z8/z8_timerisr.c @@ -83,7 +83,7 @@ static int z8_timerisr(int irq, uint32_t *regs, void *arg) ****************************************************************************/ /**************************************************************************** - * Function: z80_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -91,7 +91,7 @@ static int z8_timerisr(int irq, uint32_t *regs, void *arg) * ****************************************************************************/ -void z80_timer_initialize(void) +void up_timer_initialize(void) { uint32_t reload; diff --git a/boards/arm/lpc31xx/ea3131/locked/mklocked.sh b/boards/arm/lpc31xx/ea3131/locked/mklocked.sh index e0d31e1458d..4ca7c733d3c 100755 --- a/boards/arm/lpc31xx/ea3131/locked/mklocked.sh +++ b/boards/arm/lpc31xx/ea3131/locked/mklocked.sh @@ -115,7 +115,7 @@ echo "EXTERN(up_vectoraddrexcptn)" >>ld-locked.inc # # Of course, this list must be extended as interrupt handlers are added. -echo "EXTERN(arm_timer_initialize)" >>ld-locked.inc +echo "EXTERN(up_timer_initialize)" >>ld-locked.inc answer=$(checkconfig CONFIG_LPC31_UART) if [ "$answer" = y ]; then diff --git a/boards/xtensa/esp32/esp32-core/README.txt b/boards/xtensa/esp32/esp32-core/README.txt index 06bd4723e06..2225e99231d 100644 --- a/boards/xtensa/esp32/esp32-core/README.txt +++ b/boards/xtensa/esp32/esp32-core/README.txt @@ -566,7 +566,7 @@ OpenOCD for the ESP32 Single stepping works fine for me as do breakpoints: - Breakpoint 1, xtensa_timer_initialize () at chip/esp32_timerisr.c:172 + Breakpoint 1, up_timer_initialize () at chip/esp32_timerisr.c:172 72 { (gdb) n esp32.cpu0: Target halted, pc=0x400835BF diff --git a/boards/z80/z80/z80sim/src/z80_irq.c b/boards/z80/z80/z80sim/src/z80_irq.c index 7dcd960a209..3efee0fe4dc 100644 --- a/boards/z80/z80/z80sim/src/z80_irq.c +++ b/boards/z80/z80/z80sim/src/z80_irq.c @@ -67,7 +67,7 @@ void up_irqinitialize(void) * NOTE: Normally, there are separate enables for "global" interrupts * and specific device interrupts. In such a "normal" case, the timer * interrupt should be attached and enabled in the function - * z80_timer_initialize() + * up_timer_initialize() */ irq_attach(Z80_IRQ_SYSTIMER, (xcpt_t)z80sim_timerisr, NULL); diff --git a/boards/z80/z80/z80sim/src/z80_timerisr.c b/boards/z80/z80/z80sim/src/z80_timerisr.c index 38636236657..9b6c2278f21 100644 --- a/boards/z80/z80/z80sim/src/z80_timerisr.c +++ b/boards/z80/z80/z80sim/src/z80_timerisr.c @@ -68,7 +68,7 @@ int z80sim_timerisr(int irq, FAR chipreg_t *regs, void *arg) } /**************************************************************************** - * Function: z80_timer_initialize + * Function: up_timer_initialize * * Description: * This function is called during start-up to initialize the timer @@ -76,7 +76,7 @@ int z80sim_timerisr(int irq, FAR chipreg_t *regs, void *arg) * ****************************************************************************/ -void z80_timer_initialize(void) +void up_timer_initialize(void) { /* The timer interrupt was attached in up_irqinitialize -- see comments * there. diff --git a/include/nuttx/arch.h b/include/nuttx/arch.h index a7665b06486..ea22e018046 100644 --- a/include/nuttx/arch.h +++ b/include/nuttx/arch.h @@ -1416,6 +1416,17 @@ void up_trigger_irq(int irq); int up_prioritize_irq(int irq, int priority); #endif +/**************************************************************************** + * Function: up_timer_initialize + * + * Description: + * This function is called during start-up to initialize + * the timer hardware. + * + ****************************************************************************/ + +void up_timer_initialize(void); + /**************************************************************************** * Tickless OS Support. * diff --git a/sched/clock/clock_initialize.c b/sched/clock/clock_initialize.c index 116b0bc877c..4f99012e38a 100644 --- a/sched/clock/clock_initialize.c +++ b/sched/clock/clock_initialize.c @@ -65,9 +65,9 @@ #ifndef CONFIG_SCHED_TICKLESS #ifdef CONFIG_SYSTEM_TIME64 -volatile uint64_t g_system_timer; +volatile uint64_t g_system_timer = INITIAL_SYSTEM_TIMER_TICKS; #else -volatile uint32_t g_system_timer; +volatile uint32_t g_system_timer = INITIAL_SYSTEM_TIMER_TICKS; #endif #endif @@ -170,37 +170,31 @@ int clock_basetime(FAR struct timespec *tp) * ****************************************************************************/ +#ifdef CONFIG_RTC static void clock_inittime(void) { /* (Re-)initialize the time value to match the RTC */ #ifndef CONFIG_CLOCK_TIMEKEEPING + struct timespec ts; + clock_basetime(&g_basetime); + clock_systimespec(&ts); -#ifndef CONFIG_SCHED_TICKLESS - g_system_timer = INITIAL_SYSTEM_TIMER_TICKS; - if (g_system_timer > 0) + /* Adjust base time to hide initial timer ticks. */ + + g_basetime.tv_sec -= ts.tv_sec; + g_basetime.tv_nsec -= ts.tv_nsec; + while (g_basetime.tv_nsec < 0) { - struct timespec ts; - - clock_ticks2time((sclock_t)g_system_timer, &ts); - - /* Adjust base time to hide initial timer ticks. */ - - g_basetime.tv_sec -= ts.tv_sec; - g_basetime.tv_nsec -= ts.tv_nsec; - while (g_basetime.tv_nsec < 0) - { - g_basetime.tv_nsec += NSEC_PER_SEC; - g_basetime.tv_sec--; - } + g_basetime.tv_nsec += NSEC_PER_SEC; + g_basetime.tv_sec--; } -#endif /* !CONFIG_SCHED_TICKLESS */ - #else clock_inittimekeeping(); #endif } +#endif /**************************************************************************** * Public Functions @@ -216,17 +210,25 @@ static void clock_inittime(void) void clock_initialize(void) { +#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && \ + !defined(CONFIG_SUPPRESS_TIMER_INTS) && \ + !defined(CONFIG_SYSTEMTICK_EXTCLK) + /* Initialize the system timer interrupt */ + + up_timer_initialize(); +#endif + #if defined(CONFIG_RTC) && !defined(CONFIG_RTC_EXTERNAL) /* Initialize the internal RTC hardware. Initialization of external RTC * must be deferred until the system has booted. */ up_rtc_initialize(); -#endif /* Initialize the time value to match the RTC */ clock_inittime(); +#endif } /****************************************************************************