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

Rename sched_alarm_expiration to nxsched_alarm_expiration. That is the appropriate name for an internal sched/ function (still many named incorrectly).

Browse Source
This commit is contained in:
Gregory Nutt 2019-03-20 19:34:23 -06:00
parent 9acb652e29
commit 842d3dc4e5
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/NuttxPortingGuide.html
View File

@ -159,7 +159,7 @@
<a href="#listmgmt">4.7.2 OS List Management APIs</a><br>
<a href="#schedprocesstimer">4.7.3 <code>nxsched_process_timer()</code></a><br>
<a href="#schedtimerexpiration">4.7.4 <code>nxsched_timer_expiration()</code></a><br>
<a href="#schedalarmexpiration">4.7.5 <code>sched_alarm_expiration()</code></a><br>
<a href="#schedalarmexpiration">4.7.5 <code>nxsched_alarm_expiration()</code></a><br>
<a href="#irqdispatch">4.7.6 <code>irq_dispatch()</code></a>
</ul>
<a href="#internalOS">4.8 Application OS vs. Internal OS Interfaces</a><br>
@ -2650,7 +2650,7 @@ config ARCH_SIM
</p>
<ul>
<li>
<a href="#schedalarmexpiration"><code>sched_alarm_expiration()</code></a>. Called by the platform-specific logic when the alarm expires.
<a href="#schedalarmexpiration"><code>nxsched_alarm_expiration()</code></a>. Called by the platform-specific logic when the alarm expires.
</li>
<li>
<a href="#schedtimerexpiration"><code>nxsched_timer_expiration()</code></a>. Called by the platform-specific logic when the interval time expires.
@ -3983,7 +3983,7 @@ void nxsched_timer_expiration(void);
Base code implementation assumes that this function is called from interrupt handling logic with interrupts disabled.
</ul>
<h3><a name="schedalarmexpiration">4.7.5 <code>sched_alarm_expiration()</code></a></h3>
<h3><a name="schedalarmexpiration">4.7.5 <code>nxsched_alarm_expiration()</code></a></h3>
<p><b>Function Prototype</b>:<p>
<ul><pre>
#include &lt;nuttx/arch.h&gt;

2
arch/arm/src/lpc43xx/lpc43_rit.c
View File

@ -101,7 +101,7 @@ static int lpc43_RIT_isr(int irq, FAR void *context, FAR void *arg)
g_ts.tv_sec = (uint32_t)(internal_timer / 1000000000);
g_ts.tv_nsec = (uint32_t)(internal_timer % 1000000000);
sched_alarm_expiration(&g_ts);
nxsched_alarm_expiration(&g_ts);
}
leave_critical_section(flags);

2
arch/arm/src/lpc43xx/lpc43_tickless_rit.c
View File

@ -528,7 +528,7 @@ static inline void lpc43_tl_alarm(uint32_t curr)
#ifdef CONFIG_SCHED_TICKLESS_ALARM
struct timespec ts;
up_timer_gettime(&ts);
sched_alarm_expiration(&ts);
nxsched_alarm_expiration(&ts);
#else
nxsched_timer_expiration();
#endif

2
arch/arm/src/lpc54xx/lpc54_tickless.c
View File

@ -558,7 +558,7 @@ static inline void lpc54_tl_alarm(uint64_t curr)
#ifdef CONFIG_SCHED_TICKLESS_ALARM
struct timespec ts;
up_timer_gettime(&ts);
sched_alarm_expiration(&ts);
nxsched_alarm_expiration(&ts);
#else
nxsched_timer_expiration();
#endif

8
drivers/timers/arch_alarm.c
View File

@ -167,7 +167,7 @@ static void oneshot_callback(FAR struct oneshot_lowerhalf_s *lower,
#ifdef CONFIG_SCHED_TICKLESS
ONESHOT_CURRENT(g_oneshot_lower, &now);
sched_alarm_expiration(&now);
nxsched_alarm_expiration(&now);
#else
struct timespec delta;
@ -306,7 +306,7 @@ int up_timer_gettime(FAR 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.
* sched_alarm_expiration() will not be called unless the alarm is
* nxsched_alarm_expiration() 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
@ -353,14 +353,14 @@ int up_alarm_cancel(FAR struct timespec *ts)
* Name: up_alarm_start
*
* Description:
* Start the alarm. sched_alarm_expiration() will be called when the
* Start the alarm. nxsched_alarm_expiration() 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.
*
* Input Parameters:
* ts - The time in the future at the alarm is expected to occur. When
* the alarm occurs the timer logic will call sched_alarm_expiration().
* the alarm occurs the timer logic will call nxsched_alarm_expiration().
*
* Returned Value:
* Zero (OK) is returned on success; a negated errno value is returned on

12
include/nuttx/arch.h
View File

@ -1431,7 +1431,7 @@ int up_prioritize_irq(int irq, int priority);
* specific interval timer implementation:
*
* #ifdef CONFIG_SCHED_TICKLESS_ALARM
* void sched_alarm_expiration(FAR const struct timespec *ts): Called
* void nxsched_alarm_expiration(FAR const struct timespec *ts): Called
* by the platform-specific logic when the alarm expires.
* #else
* void nxsched_timer_expiration(void): Called by the platform-specific
@ -1488,7 +1488,7 @@ void up_timer_getmask(FAR uint64_t *mask);
* Description:
* Cancel the alarm and return the time of cancellation of the alarm.
* These two steps need to be as nearly atomic as possible.
* sched_alarm_expiration() will not be called unless the alarm is
* nxsched_alarm_expiration() 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
@ -1524,14 +1524,14 @@ int up_alarm_cancel(FAR struct timespec *ts);
* Name: up_alarm_start
*
* Description:
* Start the alarm. sched_alarm_expiration() will be called when the
* Start the alarm. nxsched_alarm_expiration() 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.
*
* Input Parameters:
* ts - The time in the future at the alarm is expected to occur. When
* the alarm occurs the timer logic will call sched_alarm_expiration().
* the alarm occurs the timer logic will call nxsched_alarm_expiration().
*
* Returned Value:
* Zero (OK) is returned on success; a negated errno value is returned on
@ -2030,7 +2030,7 @@ void nxsched_timer_expiration(void);
#endif
/****************************************************************************
* Name: sched_alarm_expiration
* Name: nxsched_alarm_expiration
*
* Description:
* if CONFIG_SCHED_TICKLESS is defined, then this function is provided by
@ -2050,7 +2050,7 @@ void nxsched_timer_expiration(void);
****************************************************************************/
#if defined(CONFIG_SCHED_TICKLESS) && defined(CONFIG_SCHED_TICKLESS_ALARM)
void sched_alarm_expiration(FAR const struct timespec *ts);
void nxsched_alarm_expiration(FAR const struct timespec *ts);
#endif
/****************************************************************************

4
sched/sched/sched_timerexpiration.c
View File

@ -465,7 +465,7 @@ static void nxsched_timer_start(unsigned int ticks)
****************************************************************************/
/****************************************************************************
* Name: sched_alarm_expiration
* Name: nxsched_alarm_expiration
*
* Description:
* if CONFIG_SCHED_TICKLESS is defined, then this function is provided by
@ -485,7 +485,7 @@ static void nxsched_timer_start(unsigned int ticks)
****************************************************************************/
#ifdef CONFIG_SCHED_TICKLESS_ALARM
void sched_alarm_expiration(FAR const struct timespec *ts)
void nxsched_alarm_expiration(FAR const struct timespec *ts)
{
unsigned int elapsed;
unsigned int nexttime;