Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 17:48:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arch/riscv/src/esp32c3/esp32c3_rt_timer: Fix typos and re-word some

Browse Source 
comments.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche
2021-05-26 12:23:56 +01:00
committed by David Sidrane
parent 08aa9ce540
commit e29da149e3
2 changed files with 65 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/risc-v/src/esp32c3/esp32c3_rt_timer.c
+50 -55
View File
@@ -81,13 +81,13 @@ static struct esp32c3_tim_dev_s *s_esp32c3_tim_dev;
* Name: start_rt_timer * Name: start_rt_timer
* *
* Description: * Description:
* Start timer by inserting it into running list and reset hardware timer * Start the timer by inserting it into the running list and reset the
* alarm value if this timer in head of list. * hardware timer alarm value if this timer is at the head of the list.
* *
* Input Parameters: * Input Parameters:
* timer - RT timer pointer * timer - RT timer pointer
* timeout - Timeout value * timeout - Timeout value
* repeat - If the timer run repeat * repeat - repeat mode (true: enabled, false: disabled)
* *
* Returned Value: * Returned Value:
* None. * None.
@@ -125,7 +125,7 @@ static void start_rt_timer(FAR struct rt_timer_s *timer,
timer->flags &= ~RT_TIMER_REPEAT; timer->flags &= ~RT_TIMER_REPEAT;
} }
/** Scan timer list and insert the new timer into previous /* Scan the timer list and insert the new timer into previous
* node of timer whose alarm value is larger than new one * node of timer whose alarm value is larger than new one
*/ */
@@ -139,7 +139,9 @@ static void start_rt_timer(FAR struct rt_timer_s *timer,
} }
} }
/* If not find a larger one, insert new timer into tail of list */ /* If we didn't find a larger one, insert the new timer at the tail
* of the list.
*/
if (!inserted) if (!inserted)
{ {
@@ -148,11 +150,11 @@ static void start_rt_timer(FAR struct rt_timer_s *timer,
timer->state = RT_TIMER_READY; timer->state = RT_TIMER_READY;
/* If this timer is in head of list */ /* If this timer is at the head of the list */
if (timer == container_of(s_runlist.next, struct rt_timer_s, list)) if (timer == container_of(s_runlist.next, struct rt_timer_s, list))
{ {
/* Reset hardware timer alarm */ /* Reset the hardware timer alarm */
ESP32C3_TIM_SETALRVL(tim, timer->alarm); ESP32C3_TIM_SETALRVL(tim, timer->alarm);
ESP32C3_TIM_SETALRM(tim, true); ESP32C3_TIM_SETALRM(tim, true);
@@ -166,8 +168,8 @@ static void start_rt_timer(FAR struct rt_timer_s *timer,
* Name: stop_rt_timer * Name: stop_rt_timer
* *
* Description: * Description:
* Stop timer by removing it from running list and reset hardware timer * Stop the timer by removing it from the running list and reset the
* alarm value if this timer is in head of list. * hardware timer alarm value if this timer is at the head of list.
* *
* Input Parameters: * Input Parameters:
* timer - RT timer pointer * timer - RT timer pointer
@@ -187,18 +189,17 @@ static void stop_rt_timer(FAR struct rt_timer_s *timer)
flags = enter_critical_section(); flags = enter_critical_section();
/** /* "start" function can set the timer's repeat flag, and "stop" function
* Function "start" can set timer to be repeat, and function "stop" * should remove this flag.
* should remove this feature although it is not in ready state.
*/ */
timer->flags &= ~RT_TIMER_REPEAT; timer->flags &= ~RT_TIMER_REPEAT;
/* Only ready timer can be stopped */ /* Only timers in "ready" state can be stopped */
if (timer->state == RT_TIMER_READY) if (timer->state == RT_TIMER_READY)
{ {
/* Check if timer is in head of list */ /* Check if the timer is at the head of the list */
if (timer == container_of(s_runlist.next, struct rt_timer_s, list)) if (timer == container_of(s_runlist.next, struct rt_timer_s, list))
{ {
@@ -212,15 +213,15 @@ static void stop_rt_timer(FAR struct rt_timer_s *timer)
list_delete(&timer->list); list_delete(&timer->list);
timer->state = RT_TIMER_IDLE; timer->state = RT_TIMER_IDLE;
/* If timer is in in head of list */ /* If the timer is at the head of the list */
if (ishead) if (ishead)
{ {
/* If list is not empty */
if (!list_is_empty(&s_runlist)) if (!list_is_empty(&s_runlist))
{ {
/* Reset hardware timer alarm value to be next timer's */ /* Set the value from the next timer as the new hardware timer
* alarm value.
*/
next_timer = container_of(s_runlist.next, next_timer = container_of(s_runlist.next,
struct rt_timer_s, struct rt_timer_s,
@@ -240,9 +241,9 @@ static void stop_rt_timer(FAR struct rt_timer_s *timer)
* Name: delete_rt_timer * Name: delete_rt_timer
* *
* Description: * Description:
* Delete timer by removing it from list, then set the timer's state * Delete the timer by removing it from the list, then set the timer's
* to be "RT_TIMER_DELETE", inserting into work list to let rt-timer * state to "RT_TIMER_DELETE" and finally insert it into the work list
* thread to delete it and free resource. * to let the rt-timer's thread to delete it and free the resources.
* *
* Input Parameters: * Input Parameters:
* timer - RT timer pointer * timer - RT timer pointer
@@ -275,7 +276,7 @@ static void delete_rt_timer(FAR struct rt_timer_s *timer)
list_add_after(&s_toutlist, &timer->list); list_add_after(&s_toutlist, &timer->list);
timer->state = RT_TIMER_DELETE; timer->state = RT_TIMER_DELETE;
/* Wake up thread to process deleted timers */ /* Wake up the thread to process deleted timers */
ret = nxsem_post(&s_toutsem); ret = nxsem_post(&s_toutsem);
if (ret < 0) if (ret < 0)
@@ -291,8 +292,8 @@ exit:
* Name: rt_timer_thread * Name: rt_timer_thread
* *
* Description: * Description:
* RT timer working thread, it wait for a timeout semaphore, scan * RT timer working thread: Waits for a timeout semaphore, scans
* the timeout list and process all timers in this list. * the timeout list and processes all the timers in the list.
* *
* Input Parameters: * Input Parameters:
* argc - Not used * argc - Not used
@@ -312,7 +313,7 @@ static int rt_timer_thread(int argc, FAR char *argv[])
while (1) while (1)
{ {
/* Waiting for timers timeout */ /* Waiting for all timers to time out */
ret = nxsem_wait(&s_toutsem); ret = nxsem_wait(&s_toutsem);
if (ret) if (ret)
@@ -321,15 +322,13 @@ static int rt_timer_thread(int argc, FAR char *argv[])
assert(0); assert(0);
} }
/* Enter critical to check global timer timeout list */
flags = enter_critical_section(); flags = enter_critical_section();
/* Process all timers in list */ /* Process all the timers in list */
while (!list_is_empty(&s_toutlist)) while (!list_is_empty(&s_toutlist))
{ {
/* Get first timer in list */ /* Get the first timer in the list */
timer = container_of(s_toutlist.next, struct rt_timer_s, list); timer = container_of(s_toutlist.next, struct rt_timer_s, list);
@@ -337,16 +336,14 @@ static int rt_timer_thread(int argc, FAR char *argv[])
raw_state = timer->state; raw_state = timer->state;
/* Delete timer from list */ /* Delete the timer from the list */
list_delete(&timer->list); list_delete(&timer->list);
/* Set timer's state to be let it to able to restart by user */ /* Set timer's state to idle so it can be restarted by the user. */
timer->state = RT_TIMER_IDLE; timer->state = RT_TIMER_IDLE;
/* Leave from critical to start to call "callback" function */
leave_critical_section(flags); leave_critical_section(flags);
if (raw_state == RT_TIMER_TIMEOUT) if (raw_state == RT_TIMER_TIMEOUT)
@@ -358,13 +355,13 @@ static int rt_timer_thread(int argc, FAR char *argv[])
kmm_free(timer); kmm_free(timer);
} }
/* Enter critical for next scanning list */ /* Enter critical section for next scanning list */
flags = enter_critical_section(); flags = enter_critical_section();
if (raw_state == RT_TIMER_TIMEOUT) if (raw_state == RT_TIMER_TIMEOUT)
{ {
/* Check if timer is repeat */ /* Check if the timer is in "repeat" mode */
if (timer->flags & RT_TIMER_REPEAT) if (timer->flags & RT_TIMER_REPEAT)
{ {
@@ -383,7 +380,7 @@ static int rt_timer_thread(int argc, FAR char *argv[])
* Name: rt_timer_isr * Name: rt_timer_isr
* *
* Description: * Description:
* Hardware timer interrupt service function. * Hardware timer interrupt service routine.
* *
* Input Parameters: * Input Parameters:
* irq - Not used * irq - Not used
@@ -411,7 +408,7 @@ static int rt_timer_isr(int irq, void *context, void *arg)
flags = enter_critical_section(); flags = enter_critical_section();
/* Check if there is timer running */ /* Check if there is a timer running */
if (!list_is_empty(&s_runlist)) if (!list_is_empty(&s_runlist))
{ {
@@ -425,12 +422,11 @@ static int rt_timer_isr(int irq, void *context, void *arg)
ESP32C3_TIM_GETCTR(tim, &counter); ESP32C3_TIM_GETCTR(tim, &counter);
if (timer->alarm <= counter) if (timer->alarm <= counter)
{ {
/** /* Remove the first timer from the running list and add it to
* Remove first timer in running list and add it into * the timeout list.
* timeout list.
* *
* Set the timer's state to be RT_TIMER_TIMEOUT to avoid * Set the timer's state to be RT_TIMER_TIMEOUT to avoid
* other operation. * other operations.
*/ */
list_delete(&timer->list); list_delete(&timer->list);
@@ -438,7 +434,7 @@ static int rt_timer_isr(int irq, void *context, void *arg)
list_add_after(&s_toutlist, &timer->list); list_add_after(&s_toutlist, &timer->list);
wake = true; wake = true;
/* Check if thers is timer running */ /* Check if there is a timer running */
if (!list_is_empty(&s_runlist)) if (!list_is_empty(&s_runlist))
{ {
@@ -451,14 +447,14 @@ static int rt_timer_isr(int irq, void *context, void *arg)
} }
} }
/* If there is timer in list, alarm should be enable */ /* If there is a timer in the list, the alarm should be enabled */
ESP32C3_TIM_SETALRM(tim, true); ESP32C3_TIM_SETALRM(tim, true);
} }
if (wake) if (wake)
{ {
/* Wake up thread to process timeout timers */ /* Wake up the thread to process timed-out timers */
ret = nxsem_post(&s_toutsem); ret = nxsem_post(&s_toutsem);
if (ret < 0) if (ret < 0)
@@ -480,7 +476,7 @@ static int rt_timer_isr(int irq, void *context, void *arg)
* Name: rt_timer_create * Name: rt_timer_create
* *
* Description: * Description:
* Create RT timer by into timer creation arguments * Create a RT timer from the provided arguments.
* *
* Input Parameters: * Input Parameters:
* args - Input RT timer creation arguments * args - Input RT timer creation arguments
@@ -518,12 +514,12 @@ int rt_timer_create(FAR const struct rt_timer_args_s *args,
* Name: rt_timer_start * Name: rt_timer_start
* *
* Description: * Description:
* Start RT timer. * Start the RT timer.
* *
* Input Parameters: * Input Parameters:
* timer - RT timer pointer * timer - RT timer pointer
* timeout - Timeout value * timeout - Timeout value
* repeat - If the timer run repeat * repeat - repeat mode (true: enabled, false: disabled)
* *
* Returned Value: * Returned Value:
* None * None
@@ -543,7 +539,7 @@ void rt_timer_start(FAR struct rt_timer_s *timer,
* Name: rt_timer_stop * Name: rt_timer_stop
* *
* Description: * Description:
* Stop RT timer. * Stop the RT timer.
* *
* Input Parameters: * Input Parameters:
* timer - RT timer pointer * timer - RT timer pointer
@@ -562,7 +558,7 @@ void rt_timer_stop(FAR struct rt_timer_s *timer)
* Name: rt_timer_delete * Name: rt_timer_delete
* *
* Description: * Description:
* Stop and delete RT timer. * Stop and delete the RT timer.
* *
* Input Parameters: * Input Parameters:
* timer - RT timer pointer * timer - RT timer pointer
@@ -581,13 +577,13 @@ void rt_timer_delete(FAR struct rt_timer_s *timer)
* Name: rt_timer_time_us * Name: rt_timer_time_us
* *
* Description: * Description:
* Get time of RT timer by microsecond. * Get time of the RT timer in microseconds.
* *
* Input Parameters: * Input Parameters:
* None * None
* *
* Returned Value: * Returned Value:
* Time of RT timer by microsecond. * Time of the RT timer in microseconds.
* *
****************************************************************************/ ****************************************************************************/
@@ -611,7 +607,7 @@ uint64_t IRAM_ATTR rt_timer_time_us(void)
* None * None
* *
* Returned Value: * Returned Value:
* Timestamp of the nearest timer event, in microseconds. * Timestamp of the nearest timer event in microseconds.
* *
****************************************************************************/ ****************************************************************************/
@@ -648,7 +644,7 @@ uint64_t IRAM_ATTR rt_timer_get_alarm(void)
* Adjust current RT timer by a certain value. * Adjust current RT timer by a certain value.
* *
* Input Parameters: * Input Parameters:
* time_us - adjustment to apply to RT timer, in microseconds * time_us - adjustment to apply to the RT timer in microseconds.
* *
* Returned Value: * Returned Value:
* None. * None.
@@ -718,8 +714,7 @@ int esp32c3_rt_timer_init(void)
flags = enter_critical_section(); flags = enter_critical_section();
/** /* ESP32-C3 hardware timer configuration:
* ESP32-C3 hardware timer configuration:
* - 1 counter = 1us * - 1 counter = 1us
* - Counter increase mode * - Counter increase mode
* - Non-reload mode * - Non-reload mode
arch/risc-v/src/esp32c3/esp32c3_rt_timer.h
+14 -14
View File
@@ -35,8 +35,8 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#define RT_TIMER_NOFLAGS (0) /* Timer support no feature */ #define RT_TIMER_NOFLAGS (0) /* Timer supports no feature */
#define RT_TIMER_REPEAT (1 << 0) /* Timer is repeat */ #define RT_TIMER_REPEAT (1 << 0) /* Timer supports repeat mode */
/**************************************************************************** /****************************************************************************
* Public Types * Public Types
@@ -50,7 +50,7 @@ enum rt_timer_state_e
{ {
RT_TIMER_IDLE, /* Timer is not counting */ RT_TIMER_IDLE, /* Timer is not counting */
RT_TIMER_READY, /* Timer is counting */ RT_TIMER_READY, /* Timer is counting */
RT_TIMER_TIMEOUT, /* Timer is timeout */ RT_TIMER_TIMEOUT, /* Timer timed out */
RT_TIMER_DELETE /* Timer is to be delete */ RT_TIMER_DELETE /* Timer is to be delete */
}; };
@@ -64,8 +64,8 @@ struct rt_timer_s
uint64_t alarm; /* Timeout period */ uint64_t alarm; /* Timeout period */
void (*callback)(void *arg); /* Callback function */ void (*callback)(void *arg); /* Callback function */
void *arg; /* Private data */ void *arg; /* Private data */
uint16_t flags; /* Support feature */ uint16_t flags; /* Supported features */
enum rt_timer_state_e state; /* Mark if timer is started */ enum rt_timer_state_e state; /* Timer state */
struct list_node list; /* Working list */ struct list_node list; /* Working list */
}; };
@@ -96,7 +96,7 @@ extern "C"
* Name: rt_timer_create * Name: rt_timer_create
* *
* Description: * Description:
* Create RT timer by into timer creation arguments * Create a RT timer from the provided arguments.
* *
* Input Parameters: * Input Parameters:
* args - Input RT timer creation arguments * args - Input RT timer creation arguments
@@ -114,12 +114,12 @@ int rt_timer_create(const struct rt_timer_args_s *args,
* Name: rt_timer_start * Name: rt_timer_start
* *
* Description: * Description:
* Start RT timer. * Start the RT timer.
* *
* Input Parameters: * Input Parameters:
* timer - RT timer pointer * timer - RT timer pointer
* timeout - Timeout value * timeout - Timeout value
* repeat - If the timer run repeat * repeat - repeat mode (true: enabled, false: disabled)
* *
* Returned Value: * Returned Value:
* None * None
@@ -134,7 +134,7 @@ void rt_timer_start(struct rt_timer_s *timer,
* Name: rt_timer_stop * Name: rt_timer_stop
* *
* Description: * Description:
* Stop RT timer. * Stop the RT timer.
* *
* Input Parameters: * Input Parameters:
* timer - RT timer pointer * timer - RT timer pointer
@@ -150,7 +150,7 @@ void rt_timer_stop(struct rt_timer_s *timer);
* Name: rt_timer_delete * Name: rt_timer_delete
* *
* Description: * Description:
* Stop and delete RT timer. * Stop and delete the RT timer.
* *
* Input Parameters: * Input Parameters:
* timer - RT timer pointer * timer - RT timer pointer
@@ -166,13 +166,13 @@ void rt_timer_delete(struct rt_timer_s *timer);
* Name: rt_timer_time_us * Name: rt_timer_time_us
* *
* Description: * Description:
* Get time of RT timer by microsecond. * Get time of the RT timer in microseconds.
* *
* Input Parameters: * Input Parameters:
* None * None
* *
* Returned Value: * Returned Value:
* Time of RT timer by microsecond. * Time of the RT timer in microseconds.
* *
****************************************************************************/ ****************************************************************************/
@@ -188,7 +188,7 @@ uint64_t rt_timer_time_us(void);
* None * None
* *
* Returned Value: * Returned Value:
* Timestamp of the nearest timer event, in microseconds. * Timestamp of the nearest timer event in microseconds.
* *
****************************************************************************/ ****************************************************************************/
@@ -201,7 +201,7 @@ uint64_t rt_timer_get_alarm(void);
* Adjust current RT timer by a certain value. * Adjust current RT timer by a certain value.
* *
* Input Parameters: * Input Parameters:
* time_us - adjustment to apply to RT timer, in microseconds * time_us - adjustment to apply to the RT timer in microseconds.
* *
* Returned Value: * Returned Value:
* None. * None.