espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 12:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

esp_timer: use _ISR version of port{ENTER,EXIT}_CRITICAL from ISR

Browse Source
This commit is contained in:
Ivan Grokhotkov
2018-02-02 00:15:55 +08:00
committed by Mahavir Jain
parent 41ae0fe52b
commit 2d598d6fb7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/esp32/esp_timer_esp32.c
View File

@@ -243,7 +243,7 @@ void IRAM_ATTR esp_timer_impl_set_alarm(uint64_t timestamp)
static void IRAM_ATTR timer_alarm_isr(void *arg) static void IRAM_ATTR timer_alarm_isr(void *arg)
{ {
portENTER_CRITICAL(&s_time_update_lock); portENTER_CRITICAL_ISR(&s_time_update_lock);
// Timekeeping: adjust s_time_base_us if counter has passed ALARM_OVERFLOW_VAL // Timekeeping: adjust s_time_base_us if counter has passed ALARM_OVERFLOW_VAL
if (timer_overflow_happened()) { if (timer_overflow_happened()) {
timer_count_reload(); timer_count_reload();
@@ -256,17 +256,17 @@ static void IRAM_ATTR timer_alarm_isr(void *arg)
// Set alarm to the next overflow moment. Later, upper layer function may // Set alarm to the next overflow moment. Later, upper layer function may
// call esp_timer_impl_set_alarm to change this to an earlier value. // call esp_timer_impl_set_alarm to change this to an earlier value.
REG_WRITE(FRC_TIMER_ALARM_REG(1), ALARM_OVERFLOW_VAL); REG_WRITE(FRC_TIMER_ALARM_REG(1), ALARM_OVERFLOW_VAL);
portEXIT_CRITICAL(&s_time_update_lock); portEXIT_CRITICAL_ISR(&s_time_update_lock);
// Call the upper layer handler // Call the upper layer handler
(*s_alarm_handler)(arg); (*s_alarm_handler)(arg);
} }
void IRAM_ATTR esp_timer_impl_update_apb_freq(uint32_t apb_ticks_per_us) void IRAM_ATTR esp_timer_impl_update_apb_freq(uint32_t apb_ticks_per_us)
{ {
portENTER_CRITICAL(&s_time_update_lock); portENTER_CRITICAL_ISR(&s_time_update_lock);
/* Bail out if the timer is not initialized yet */ /* Bail out if the timer is not initialized yet */
if (s_timer_interrupt_handle == NULL) { if (s_timer_interrupt_handle == NULL) {
portEXIT_CRITICAL(&s_time_update_lock); portEXIT_CRITICAL_ISR(&s_time_update_lock);
return; return;
} }
@@ -308,7 +308,7 @@ void IRAM_ATTR esp_timer_impl_update_apb_freq(uint32_t apb_ticks_per_us)
s_timer_ticks_per_us = new_ticks_per_us; s_timer_ticks_per_us = new_ticks_per_us;
s_timer_us_per_overflow = ALARM_OVERFLOW_VAL / new_ticks_per_us; s_timer_us_per_overflow = ALARM_OVERFLOW_VAL / new_ticks_per_us;
portEXIT_CRITICAL(&s_time_update_lock); portEXIT_CRITICAL_ISR(&s_time_update_lock);
} }
esp_err_t esp_timer_impl_init(intr_handler_t alarm_handler) esp_err_t esp_timer_impl_init(intr_handler_t alarm_handler)