feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/timer_spinlock_iram' into 'master'

Browse Source 
timer: add IRAM_ATTR to spinlock give/take API

Closes IDFGH-5038

See merge request espressif/esp-idf!13107
This commit is contained in:
Michael (XIAO Xufeng)
2021-04-19 07:41:59 +00:00
parent 828942d91f 826b976ba5
commit 2f298aa02a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/driver/include/driver/timer.h
View File

@@ -432,6 +432,8 @@ void timer_group_clr_intr_sta_in_isr(timer_group_t group_num, timer_intr_t intr_
bool timer_group_get_auto_reload_in_isr(timer_group_t group_num, timer_idx_t timer_num); bool timer_group_get_auto_reload_in_isr(timer_group_t group_num, timer_idx_t timer_num);
/** @brief Take timer spinlock to enter critical protect /** @brief Take timer spinlock to enter critical protect
*
* @note Deprecated, the recommended way is to use ISR callbacks instead, see timer_group_example_main
* *
* @param group_num Timer group number, 0 for TIMERG0 or 1 for TIMERG1 * @param group_num Timer group number, 0 for TIMERG0 or 1 for TIMERG1
* *
@@ -439,9 +441,11 @@ bool timer_group_get_auto_reload_in_isr(timer_group_t group_num, timer_idx_t tim
* - ESP_OK Success * - ESP_OK Success
* - ESP_ERR_INVALID_ARG Parameter error * - ESP_ERR_INVALID_ARG Parameter error
*/ */
esp_err_t timer_spinlock_take(timer_group_t group_num); esp_err_t timer_spinlock_take(timer_group_t group_num) __attribute__ ((deprecated));
/** @brief Give timer spinlock to exit critical protect /** @brief Give timer spinlock to exit critical protect
*
* @note Deprecated, the recommended way is to use ISR callbacks instead, see timer_group_example_main
* *
* @param group_num Timer group number, 0 for TIMERG0 or 1 for TIMERG1 * @param group_num Timer group number, 0 for TIMERG0 or 1 for TIMERG1
* *
@@ -449,7 +453,7 @@ esp_err_t timer_spinlock_take(timer_group_t group_num);
* - ESP_OK Success * - ESP_OK Success
* - ESP_ERR_INVALID_ARG Parameter error * - ESP_ERR_INVALID_ARG Parameter error
*/ */
esp_err_t timer_spinlock_give(timer_group_t group_num); esp_err_t timer_spinlock_give(timer_group_t group_num) __attribute__ ((deprecated));
#ifdef __cplusplus #ifdef __cplusplus
} }

4
components/driver/timer.c
View File

@@ -474,14 +474,14 @@ bool IRAM_ATTR timer_group_get_auto_reload_in_isr(timer_group_t group_num, timer
return timer_hal_get_auto_reload(&(p_timer_obj[group_num][timer_num]->hal)); return timer_hal_get_auto_reload(&(p_timer_obj[group_num][timer_num]->hal));
} }
esp_err_t timer_spinlock_take(timer_group_t group_num) esp_err_t IRAM_ATTR timer_spinlock_take(timer_group_t group_num)
{ {
TIMER_CHECK(group_num < TIMER_GROUP_MAX, TIMER_GROUP_NUM_ERROR, ESP_ERR_INVALID_ARG); TIMER_CHECK(group_num < TIMER_GROUP_MAX, TIMER_GROUP_NUM_ERROR, ESP_ERR_INVALID_ARG);
TIMER_ENTER_CRITICAL(&timer_spinlock[group_num]); TIMER_ENTER_CRITICAL(&timer_spinlock[group_num]);
return ESP_OK; return ESP_OK;
} }
esp_err_t timer_spinlock_give(timer_group_t group_num) esp_err_t IRAM_ATTR timer_spinlock_give(timer_group_t group_num)
{ {
TIMER_CHECK(group_num < TIMER_GROUP_MAX, TIMER_GROUP_NUM_ERROR, ESP_ERR_INVALID_ARG); TIMER_CHECK(group_num < TIMER_GROUP_MAX, TIMER_GROUP_NUM_ERROR, ESP_ERR_INVALID_ARG);
TIMER_EXIT_CRITICAL(&timer_spinlock[group_num]); TIMER_EXIT_CRITICAL(&timer_spinlock[group_num]);