espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/config_pm_use_rtc_timer_ref' into 'master'

Browse Source 
esp_timer: fix CONFIG_PM_USE_RTC_TIMER_REF option usage

Closes IDFGH-2958

See merge request espressif/esp-idf!8399
This commit is contained in:
Ivan Grokhotkov
2020-09-15 00:41:16 +08:00
parent 1a1e1911f9 0acf94f10f
commit 4fe7a58a60
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/esp_timer/src/esp_timer_impl_frc_legacy.c
View File

@@ -128,7 +128,7 @@ static uint32_t s_timer_us_per_overflow;
// will not increment s_time_base_us if this flag is set. // will not increment s_time_base_us if this flag is set.
static bool s_mask_overflow; static bool s_mask_overflow;
#ifdef CONFIG_PM_DFS_USE_RTC_TIMER_REF #ifdef CONFIG_PM_USE_RTC_TIMER_REF
// If DFS is enabled, upon the first frequency change this value is set to the // If DFS is enabled, upon the first frequency change this value is set to the
// difference between esp_timer value and RTC timer value. On every subsequent // difference between esp_timer value and RTC timer value. On every subsequent
// frequency change, s_time_base_us is adjusted to maintain the same difference // frequency change, s_time_base_us is adjusted to maintain the same difference
@@ -319,7 +319,7 @@ void IRAM_ATTR esp_timer_impl_update_apb_freq(uint32_t apb_ticks_per_us)
s_time_base_us += count / s_timer_ticks_per_us; s_time_base_us += count / s_timer_ticks_per_us;
#ifdef CONFIG_PM_DFS_USE_RTC_TIMER_REF #ifdef CONFIG_PM_USE_RTC_TIMER_REF
// Due to the extra time required to read RTC time, don't attempt this // Due to the extra time required to read RTC time, don't attempt this
// adjustment when switching to a higher frequency (which usually // adjustment when switching to a higher frequency (which usually
// happens in an interrupt). // happens in an interrupt).
@@ -333,7 +333,7 @@ void IRAM_ATTR esp_timer_impl_update_apb_freq(uint32_t apb_ticks_per_us)
s_rtc_time_diff = new_rtc_time_diff; s_rtc_time_diff = new_rtc_time_diff;
} }
} }
#endif // CONFIG_PM_DFS_USE_RTC_TIMER_REF #endif // CONFIG_PM_USE_RTC_TIMER_REF
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;