alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-17 07:09:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/gptimer_hal_placement_wrong_condition_v5.1' into 'release/v5.1'

Browse Source 
fix(gptimer): hal function placement under wrong condition (v5.1)

See merge request espressif/esp-idf!25280
This commit is contained in:
morris
2023-08-23 23:21:20 +08:00
parent 64926fd137 b7aea79cb8
commit f41df5641a
19 changed files with 106 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/hal/esp32c3/include/hal/timer_ll.h
View File

@@ -193,6 +193,7 @@ static inline void timer_ll_set_reload_value(timg_dev_t *hw, uint32_t timer_num,
* @param timer_num Timer number in the group
* @return reload count value
*/
__attribute__((always_inline))
static inline uint64_t timer_ll_get_reload_value(timg_dev_t *hw, uint32_t timer_num)
{
return ((uint64_t)hw->hw_timer[timer_num].loadhi.tx_load_hi << 32) | (hw->hw_timer[timer_num].loadlo.tx_load_lo);
@@ -204,6 +205,7 @@ static inline uint64_t timer_ll_get_reload_value(timg_dev_t *hw, uint32_t timer_
* @param hw Timer Group register base address
* @param timer_num Timer number in the group
*/
__attribute__((always_inline))
static inline void timer_ll_trigger_soft_reload(timg_dev_t *hw, uint32_t timer_num)
{
hw->hw_timer[timer_num].load.tx_load = 1;