You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2026/01/12 08:20:50 UTC
(nuttx) 02/04: nuttx/arch: merge tickless and tick process
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 15f6e399b8adf680d037f2ac42fe99dc63181210
Author: wangchengdong <wa...@lixiang.com>
AuthorDate: Mon Jan 12 11:31:03 2026 +0800
nuttx/arch: merge tickless and tick process
merge nxsched_timer_expiration() into nxsched_process_timer()
to improve code efficient
Signed-off-by: Chengdong Wang <wa...@lixiang.com>
---
arch/arm/src/imxrt/imxrt_tickless.c | 10 +++++-----
arch/arm/src/lpc43xx/lpc43_rit.c | 2 +-
arch/arm/src/lpc43xx/lpc43_tickless_rit.c | 2 +-
arch/arm/src/lpc54xx/lpc54_tickless.c | 2 +-
arch/arm/src/nrf52/nrf52_tickless_rtc.c | 4 ++--
arch/arm/src/nrf53/nrf53_tickless_rtc.c | 4 ++--
arch/arm/src/nrf91/nrf91_tickless_rtc.c | 4 ++--
arch/arm/src/sam34/sam4cm_tickless.c | 10 +++++-----
arch/arm/src/sama5/sam_tickless.c | 10 +++++-----
arch/arm/src/samd5e5/sam_tickless.c | 10 +++++-----
arch/arm/src/samv7/sam_tickless.c | 10 +++++-----
arch/arm/src/stm32/stm32_tickless.c | 10 +++++-----
arch/arm/src/stm32f7/stm32_tickless.c | 10 +++++-----
arch/arm/src/stm32h7/stm32_tickless.c | 10 +++++-----
arch/arm/src/stm32l4/stm32l4_tickless.c | 10 +++++-----
arch/arm/src/stm32wb/stm32wb_tickless.c | 10 +++++-----
arch/arm/src/xmc4/xmc4_tickless.c | 10 +++++-----
arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c | 4 ++--
arch/risc-v/src/common/espressif/esp_tickless.c | 8 ++++----
arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c | 8 ++++----
arch/risc-v/src/litex/litex_tickless.c | 8 ++++----
arch/sparc/src/bm3803/bm3803_tickless.c | 10 +++++-----
arch/xtensa/src/esp32/esp32_tickless.c | 8 ++++----
arch/xtensa/src/esp32s3/esp32s3_tickless.c | 8 ++++----
24 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/arch/arm/src/imxrt/imxrt_tickless.c b/arch/arm/src/imxrt/imxrt_tickless.c
index 406bd23cb08..bbcd10263d1 100644
--- a/arch/arm/src/imxrt/imxrt_tickless.c
+++ b/arch/arm/src/imxrt/imxrt_tickless.c
@@ -38,7 +38,7 @@
* The RTOS will provide the following interfaces for use by the platform-
* specific interval timer implementation:
*
- * void nxsched_timer_expiration(void): Called by the platform-specific
+ * void nxsched_process_timer(void): Called by the platform-specific
* logic when the interval timer expires.
*
* NOTE
@@ -183,7 +183,7 @@ static void imxrt_interval_handler(void)
g_tickless.pending = false;
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/****************************************************************************
@@ -477,7 +477,7 @@ int up_timer_gettime(struct timespec *ts)
* Name: up_alarm_start
*
* Description:
- * Start the alarm. nxsched_timer_expiration() will be called when the
+ * Start the alarm. nxsched_process_timer() will be called when the
* alarm occurs (unless up_alaram_cancel is called to stop it).
*
* Provided by platform-specific code and called from the RTOS base code.
@@ -485,7 +485,7 @@ int up_timer_gettime(struct timespec *ts)
* Input Parameters:
* ts - The time in the future at the alarm is expected to occur. When
* the alarm occurs the timer logic will call
- * nxsched_timer_expiration().
+ * nxsched_process_timer().
*
* Returned Value:
* Zero (OK) is returned on success; a negated errno value is returned on
@@ -553,7 +553,7 @@ int up_alarm_start(const struct timespec *ts)
* Description:
* Cancel the alarm and return the time of cancellation of the alarm.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the alarm is
+ * nxsched_process_timer() will not be called unless the alarm is
* restarted with up_alarm_start().
*
* If, as a race condition, the alarm has already expired when this
diff --git a/arch/arm/src/lpc43xx/lpc43_rit.c b/arch/arm/src/lpc43xx/lpc43_rit.c
index 0188723a8d5..f7e788672f1 100644
--- a/arch/arm/src/lpc43xx/lpc43_rit.c
+++ b/arch/arm/src/lpc43xx/lpc43_rit.c
@@ -86,7 +86,7 @@ static int lpc43_rit_isr(int irq, void *context, void *arg)
{
/* handle expired alarm */
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
leave_critical_section(flags);
diff --git a/arch/arm/src/lpc43xx/lpc43_tickless_rit.c b/arch/arm/src/lpc43xx/lpc43_tickless_rit.c
index 8c08db6b8b6..5dac6789b61 100644
--- a/arch/arm/src/lpc43xx/lpc43_tickless_rit.c
+++ b/arch/arm/src/lpc43xx/lpc43_tickless_rit.c
@@ -496,7 +496,7 @@ static inline void lpc43_tl_alarm(uint32_t curr)
lpc43_tl_init_timer_vars();
lpc43_tl_set_default_compare(curr);
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/* Interrupt handler */
diff --git a/arch/arm/src/lpc54xx/lpc54_tickless.c b/arch/arm/src/lpc54xx/lpc54_tickless.c
index dedd2a00db9..2ef0d16d911 100644
--- a/arch/arm/src/lpc54xx/lpc54_tickless.c
+++ b/arch/arm/src/lpc54xx/lpc54_tickless.c
@@ -539,7 +539,7 @@ static inline void lpc54_tl_alarm(uint64_t curr)
lpc54_init_timer_vars();
lpc54_set_default_compare(curr);
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/* Interrupt handler */
diff --git a/arch/arm/src/nrf52/nrf52_tickless_rtc.c b/arch/arm/src/nrf52/nrf52_tickless_rtc.c
index 78aeb7f6888..9d05a703229 100644
--- a/arch/arm/src/nrf52/nrf52_tickless_rtc.c
+++ b/arch/arm/src/nrf52/nrf52_tickless_rtc.c
@@ -246,7 +246,7 @@ static int rtc_handler(int irq, void *context, void *arg)
/* let scheduler now of alarm firing */
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
leave_critical_section(flags);
@@ -357,5 +357,5 @@ void up_timer_initialize(void)
/* kick off alarm scheduling */
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
diff --git a/arch/arm/src/nrf53/nrf53_tickless_rtc.c b/arch/arm/src/nrf53/nrf53_tickless_rtc.c
index 0af41431673..8fa6e0df338 100644
--- a/arch/arm/src/nrf53/nrf53_tickless_rtc.c
+++ b/arch/arm/src/nrf53/nrf53_tickless_rtc.c
@@ -244,7 +244,7 @@ static int rtc_handler(int irq, void *context, void *arg)
/* let scheduler now of alarm firing */
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
leave_critical_section(flags);
@@ -355,5 +355,5 @@ void up_timer_initialize(void)
/* kick off alarm scheduling */
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
diff --git a/arch/arm/src/nrf91/nrf91_tickless_rtc.c b/arch/arm/src/nrf91/nrf91_tickless_rtc.c
index 4165c01f361..b3065a54620 100644
--- a/arch/arm/src/nrf91/nrf91_tickless_rtc.c
+++ b/arch/arm/src/nrf91/nrf91_tickless_rtc.c
@@ -240,7 +240,7 @@ static int rtc_handler(int irq, void *context, void *arg)
/* let scheduler now of alarm firing */
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
leave_critical_section(flags);
@@ -351,5 +351,5 @@ void up_timer_initialize(void)
/* kick off alarm scheduling */
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
diff --git a/arch/arm/src/sam34/sam4cm_tickless.c b/arch/arm/src/sam34/sam4cm_tickless.c
index a2f2621df13..b8262b751d2 100644
--- a/arch/arm/src/sam34/sam4cm_tickless.c
+++ b/arch/arm/src/sam34/sam4cm_tickless.c
@@ -38,7 +38,7 @@
* The RTOS will provide the following interfaces for use by the platform-
* specific interval timer implementation:
*
- * void nxsched_timer_expiration(void): Called by the platform-specific
+ * void nxsched_process_timer(void): Called by the platform-specific
* logic when the interval timer expires.
*
****************************************************************************/
@@ -188,7 +188,7 @@ static struct sam_tickless_s g_tickless;
static void sam_oneshot_handler(void *arg)
{
tmrinfo("Expired...\n");
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/****************************************************************************
@@ -323,7 +323,7 @@ int up_timer_gettime(struct timespec *ts)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -365,14 +365,14 @@ int up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/arm/src/sama5/sam_tickless.c b/arch/arm/src/sama5/sam_tickless.c
index da588817430..cf497896013 100644
--- a/arch/arm/src/sama5/sam_tickless.c
+++ b/arch/arm/src/sama5/sam_tickless.c
@@ -38,7 +38,7 @@
* The RTOS will provide the following interfaces for use by the platform-
* specific interval timer implementation:
*
- * void nxsched_timer_expiration(void): Called by the platform-specific
+ * void nxsched_process_timer(void): Called by the platform-specific
* logic when the interval timer expires.
*
****************************************************************************/
@@ -200,7 +200,7 @@ static struct sam_tickless_s g_tickless;
static void sam_oneshot_handler(void *arg)
{
tmrinfo("Expired...\n");
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/****************************************************************************
@@ -335,7 +335,7 @@ int up_timer_gettime(struct timespec *ts)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -377,14 +377,14 @@ int up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/arm/src/samd5e5/sam_tickless.c b/arch/arm/src/samd5e5/sam_tickless.c
index bde7eb332e8..7629bdab14b 100644
--- a/arch/arm/src/samd5e5/sam_tickless.c
+++ b/arch/arm/src/samd5e5/sam_tickless.c
@@ -38,7 +38,7 @@
* The RTOS will provide the following interfaces for use by the platform-
* specific interval timer implementation:
*
- * void nxsched_timer_expiration(void): Called by the platform-specific
+ * void nxsched_process_timer(void): Called by the platform-specific
* logic when the interval timer expires.
*
****************************************************************************/
@@ -198,7 +198,7 @@ static struct sam_tickless_s g_tickless;
static void sam_oneshot_handler(void *arg)
{
tmrinfo("Expired...\n");
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/****************************************************************************
@@ -333,7 +333,7 @@ int up_timer_gettime(struct timespec *ts)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -375,14 +375,14 @@ int up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/arm/src/samv7/sam_tickless.c b/arch/arm/src/samv7/sam_tickless.c
index f867d0f94ae..6777cf2f8ea 100644
--- a/arch/arm/src/samv7/sam_tickless.c
+++ b/arch/arm/src/samv7/sam_tickless.c
@@ -38,7 +38,7 @@
* The RTOS will provide the following interfaces for use by the platform-
* specific interval timer implementation:
*
- * void nxsched_timer_expiration(void): Called by the platform-specific
+ * void nxsched_process_timer(void): Called by the platform-specific
* logic when the interval timer expires.
*
****************************************************************************/
@@ -212,7 +212,7 @@ static struct sam_tickless_s g_tickless;
static void sam_oneshot_handler(void *arg)
{
tmrinfo("Expired...\n");
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/****************************************************************************
@@ -321,7 +321,7 @@ int up_timer_gettime(struct timespec *ts)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -363,14 +363,14 @@ int up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/arm/src/stm32/stm32_tickless.c b/arch/arm/src/stm32/stm32_tickless.c
index 6062912deaf..d7eb0b74999 100644
--- a/arch/arm/src/stm32/stm32_tickless.c
+++ b/arch/arm/src/stm32/stm32_tickless.c
@@ -54,7 +54,7 @@
* The RTOS will provide the following interfaces for use by the platform-
* specific interval timer implementation:
*
- * void nxsched_timer_expiration(void): Called by the platform-specific
+ * void nxsched_process_timer(void): Called by the platform-specific
* logic when the interval timer expires.
*
****************************************************************************/
@@ -318,7 +318,7 @@ static void stm32_interval_handler(void)
g_tickless.pending = false;
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/****************************************************************************
@@ -746,7 +746,7 @@ void up_timer_getmask(clock_t *mask)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -883,14 +883,14 @@ int up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/arm/src/stm32f7/stm32_tickless.c b/arch/arm/src/stm32f7/stm32_tickless.c
index fcb9d1b5e3d..3e426826d27 100644
--- a/arch/arm/src/stm32f7/stm32_tickless.c
+++ b/arch/arm/src/stm32f7/stm32_tickless.c
@@ -54,7 +54,7 @@
* The RTOS will provide the following interfaces for use by the platform-
* specific interval timer implementation:
*
- * void nxsched_timer_expiration(void): Called by the platform-specific
+ * void nxsched_process_timer(void): Called by the platform-specific
* logic when the interval timer expires.
*
****************************************************************************/
@@ -322,7 +322,7 @@ static void stm32_interval_handler(void)
g_tickless.pending = false;
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/****************************************************************************
@@ -787,7 +787,7 @@ void up_timer_getmask(clock_t *mask)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -926,14 +926,14 @@ int up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/arm/src/stm32h7/stm32_tickless.c b/arch/arm/src/stm32h7/stm32_tickless.c
index feb5d85c754..7e3b712f9ff 100644
--- a/arch/arm/src/stm32h7/stm32_tickless.c
+++ b/arch/arm/src/stm32h7/stm32_tickless.c
@@ -38,7 +38,7 @@
* The RTOS will provide the following interfaces for use by the platform-
* specific interval timer implementation:
*
- * void nxsched_timer_expiration(void): Called by the platform-specific
+ * void nxsched_process_timer(void): Called by the platform-specific
* logic when the interval timer expires.
*
****************************************************************************/
@@ -309,7 +309,7 @@ static void stm32_interval_handler(void)
g_tickless.pending = false;
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/****************************************************************************
@@ -761,7 +761,7 @@ void up_timer_getmask(clock_t *mask)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -900,14 +900,14 @@ int up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/arm/src/stm32l4/stm32l4_tickless.c b/arch/arm/src/stm32l4/stm32l4_tickless.c
index de6172ea04d..6ca4f157bb3 100644
--- a/arch/arm/src/stm32l4/stm32l4_tickless.c
+++ b/arch/arm/src/stm32l4/stm32l4_tickless.c
@@ -38,7 +38,7 @@
* The RTOS will provide the following interfaces for use by the platform-
* specific interval timer implementation:
*
- * void nxsched_timer_expiration(void): Called by the platform-specific
+ * void nxsched_process_timer(void): Called by the platform-specific
* logic when the interval timer expires.
*
****************************************************************************/
@@ -144,7 +144,7 @@ static struct stm32l4_tickless_s g_tickless;
static void stm32l4_oneshot_handler(void *arg)
{
tmrinfo("Expired...\n");
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/****************************************************************************
@@ -273,7 +273,7 @@ int up_timer_gettime(struct timespec *ts)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -312,14 +312,14 @@ int up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/arm/src/stm32wb/stm32wb_tickless.c b/arch/arm/src/stm32wb/stm32wb_tickless.c
index fc24296d3ac..88c7a1bca59 100644
--- a/arch/arm/src/stm32wb/stm32wb_tickless.c
+++ b/arch/arm/src/stm32wb/stm32wb_tickless.c
@@ -38,7 +38,7 @@
* The RTOS will provide the following interfaces for use by the platform-
* specific interval timer implementation:
*
- * void nxsched_timer_expiration(void): Called by the platform-specific
+ * void nxsched_process_timer(void): Called by the platform-specific
* logic when the interval timer expires.
*
****************************************************************************/
@@ -272,7 +272,7 @@ static void stm32wb_interval_handler(void)
g_tickless.pending = false;
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/****************************************************************************
@@ -612,7 +612,7 @@ void up_timer_getmask(clock_t *mask)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -749,14 +749,14 @@ int up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/arm/src/xmc4/xmc4_tickless.c b/arch/arm/src/xmc4/xmc4_tickless.c
index ce7e35b0a8d..85c7a951118 100644
--- a/arch/arm/src/xmc4/xmc4_tickless.c
+++ b/arch/arm/src/xmc4/xmc4_tickless.c
@@ -38,7 +38,7 @@
* The RTOS will provide the following interfaces for use by the platform-
* specific interval timer implementation:
*
- * void nxsched_timer_expiration(void): Called by the platform-specific
+ * void nxsched_process_timer(void): Called by the platform-specific
* logic when the interval timer expires.
*
* NOTE
@@ -150,7 +150,7 @@ static void xmc4_interval_handler(void *arg)
putreg32(CCU4_CC4_TCCLR_TRBC_MASK, XMC4_CCU41_CC40TCCLR);
g_tickless.pending = false;
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/****************************************************************************
@@ -385,7 +385,7 @@ int up_timer_gettime(struct timespec *ts)
* Name: up_alarm_start
*
* Description:
- * Start the alarm. nxsched_timer_expiration() will be called when the
+ * Start the alarm. nxsched_process_timer() will be called when the
* alarm occurs (unless up_alaram_cancel is called to stop it).
*
* Provided by platform-specific code and called from the RTOS base code.
@@ -393,7 +393,7 @@ int up_timer_gettime(struct timespec *ts)
* Input Parameters:
* ts - The time in the future at the alarm is expected to occur. When
* the alarm occurs the timer logic will call
- * nxsched_timer_expiration().
+ * nxsched_process_timer().
*
* Returned Value:
* Zero (OK) is returned on success; a negated errno value is returned on
@@ -466,7 +466,7 @@ int up_timer_start(const struct timespec *ts)
* Description:
* Cancel the alarm and return the time of cancellation of the alarm.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the alarm is
+ * nxsched_process_timer() will not be called unless the alarm is
* restarted with up_alarm_start().
*
* If, as a race condition, the alarm has already expired when this
diff --git a/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c b/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c
index 323bcd8e53c..0257da058b2 100644
--- a/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c
+++ b/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c
@@ -269,7 +269,7 @@ static void avrdx_check_alarm_expired(uint8_t context)
* context. Remove non-interrupt flags from the context before
* using it.
*
- * Deactivate alarm first. Call to nxsched_timer_expiration()
+ * Deactivate alarm first. Call to nxsched_process_timer()
* in turns calls up_timer_gettick(), that one calls
* up_timer_gettime() which calls this method through
* avrdx_increment_uptime(), causing a recursion loop.
@@ -283,7 +283,7 @@ static void avrdx_check_alarm_expired(uint8_t context)
*/
avrdx_deactivate_alarm();
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
else
{
diff --git a/arch/risc-v/src/common/espressif/esp_tickless.c b/arch/risc-v/src/common/espressif/esp_tickless.c
index 9d7b57224eb..f66688a19b3 100644
--- a/arch/risc-v/src/common/espressif/esp_tickless.c
+++ b/arch/risc-v/src/common/espressif/esp_tickless.c
@@ -97,7 +97,7 @@ static int esp_tickless_isr(int irq, void *context, void *arg)
systimer_ll_clear_alarm_int(systimer_hal.dev,
SYSTIMER_ALARM_OS_TICK_CORE0);
- nxsched_timer_expiration();
+ nxsched_process_timer();
return OK;
}
@@ -235,7 +235,7 @@ int IRAM_ATTR up_timer_gettime(struct timespec *ts)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -325,14 +325,14 @@ int IRAM_ATTR up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c
index 4176ccee909..d16ea6308fe 100644
--- a/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c
+++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c
@@ -281,7 +281,7 @@ static void IRAM_ATTR up_timer_expire(int irq, void *regs, void *arg)
{
g_timer_started = false;
setbits(SYS_TIMER_TARGET0_INT_CLR, SYS_TIMER_SYSTIMER_INT_CLR_REG);
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/****************************************************************************
@@ -343,7 +343,7 @@ int IRAM_ATTR up_timer_gettime(struct timespec *ts)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -420,14 +420,14 @@ int IRAM_ATTR up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/risc-v/src/litex/litex_tickless.c b/arch/risc-v/src/litex/litex_tickless.c
index cb9efbaa212..48b6c6228f7 100644
--- a/arch/risc-v/src/litex/litex_tickless.c
+++ b/arch/risc-v/src/litex/litex_tickless.c
@@ -79,7 +79,7 @@ static int up_timer_expire(int irq, void *regs, void *arg)
{
g_timer_started = false;
putreg32(1 << LITEX_TIMER0_TIMEOUT_EV_OFFSET, LITEX_TIMER0_EV_PENDING);
- nxsched_timer_expiration();
+ nxsched_process_timer();
return OK;
}
@@ -211,7 +211,7 @@ int up_timer_gettime(struct timespec *ts)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -272,14 +272,14 @@ int up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/sparc/src/bm3803/bm3803_tickless.c b/arch/sparc/src/bm3803/bm3803_tickless.c
index 121d506772e..b7e100bfc12 100644
--- a/arch/sparc/src/bm3803/bm3803_tickless.c
+++ b/arch/sparc/src/bm3803/bm3803_tickless.c
@@ -38,7 +38,7 @@
* The RTOS will provide the following interfaces for use by the platform-
* specific interval timer implementation:
*
- * void nxsched_timer_expiration(void): Called by the platform-specific
+ * void nxsched_process_timer(void): Called by the platform-specific
* logic when the interval timer expires.
*
****************************************************************************/
@@ -144,7 +144,7 @@ static struct bm3803_tickless_s g_tickless;
static void bm3803_oneshot_handler(void *arg)
{
tmrinfo("Expired...\n");
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
/****************************************************************************
@@ -273,7 +273,7 @@ int up_timer_gettime(struct timespec *ts)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -312,14 +312,14 @@ int up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/xtensa/src/esp32/esp32_tickless.c b/arch/xtensa/src/esp32/esp32_tickless.c
index c57661cf6fa..d621f7d71c3 100644
--- a/arch/xtensa/src/esp32/esp32_tickless.c
+++ b/arch/xtensa/src/esp32/esp32_tickless.c
@@ -270,7 +270,7 @@ static int up_timer_expire(int irq, void *regs, void *arg)
if (do_sched)
{
up_timer_cancel(NULL);
- nxsched_timer_expiration();
+ nxsched_process_timer();
}
}
else
@@ -340,7 +340,7 @@ int IRAM_ATTR up_timer_gettime(struct timespec *ts)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -415,14 +415,14 @@ int IRAM_ATTR up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value:
diff --git a/arch/xtensa/src/esp32s3/esp32s3_tickless.c b/arch/xtensa/src/esp32s3/esp32s3_tickless.c
index fc5e56c7453..e8357b5eb95 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_tickless.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_tickless.c
@@ -255,7 +255,7 @@ static int IRAM_ATTR tickless_isr(int irq, void *context, void *arg)
return OK;
}
- nxsched_timer_expiration();
+ nxsched_process_timer();
return OK;
}
@@ -319,7 +319,7 @@ int IRAM_ATTR up_timer_gettime(struct timespec *ts)
* Description:
* Cancel the interval timer and return the time remaining on the timer.
* These two steps need to be as nearly atomic as possible.
- * nxsched_timer_expiration() will not be called unless the timer is
+ * nxsched_process_timer() will not be called unless the timer is
* restarted with up_timer_start().
*
* If, as a race condition, the timer has already expired when this
@@ -397,14 +397,14 @@ int IRAM_ATTR up_timer_cancel(struct timespec *ts)
* Name: up_timer_start
*
* Description:
- * Start the interval timer. nxsched_timer_expiration() will be
+ * Start the interval timer. nxsched_process_timer() will be
* called at the completion of the timeout (unless up_timer_cancel
* is called to stop the timing.
*
* Provided by platform-specific code and called from the RTOS base code.
*
* Input Parameters:
- * ts - Provides the time interval until nxsched_timer_expiration() is
+ * ts - Provides the time interval until nxsched_process_timer() is
* called.
*
* Returned Value: