espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-04 00:51:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/u32_reg_tsens' into 'master'

Browse Source 
fix(temperature_sensor): Fix regs on temperature sensor is not volatile due to GCC bug

See merge request espressif/esp-idf!27468
This commit is contained in:
C.S.M
2023-11-30 12:37:10 +08:00
parent 0fb0fc8654 b0c90ac456
commit cce1bf36fc
6 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/hal/esp32c6/include/hal/temperature_sensor_ll.h
View File

@@ -103,7 +103,7 @@ static inline void temperature_sensor_ll_set_range(uint32_t range)
__attribute__((always_inline))
static inline uint32_t temperature_sensor_ll_get_raw_value(void)
{
return APB_SARADC.saradc_apb_tsens_ctrl.saradc_tsens_out;
return HAL_FORCE_READ_U32_REG_FIELD(APB_SARADC.saradc_apb_tsens_ctrl, saradc_tsens_out);
}
/**
@@ -127,7 +127,7 @@ static inline uint32_t temperature_sensor_ll_get_offset(void)
*/
static inline uint32_t temperature_sensor_ll_get_clk_div(void)
{
return APB_SARADC.saradc_apb_tsens_ctrl.saradc_tsens_clk_div;
return HAL_FORCE_READ_U32_REG_FIELD(APB_SARADC.saradc_apb_tsens_ctrl, saradc_tsens_clk_div);
}
/**
@@ -140,7 +140,7 @@ static inline uint32_t temperature_sensor_ll_get_clk_div(void)
*/
static inline void temperature_sensor_ll_set_clk_div(uint8_t clk_div)
{
APB_SARADC.saradc_apb_tsens_ctrl.saradc_tsens_clk_div = clk_div;
HAL_FORCE_MODIFY_U32_REG_FIELD(APB_SARADC.saradc_apb_tsens_ctrl, saradc_tsens_clk_div, clk_div);
}
/**
@@ -183,7 +183,7 @@ static inline void temperature_sensor_ll_wakeup_enable(bool en)
*/
static inline void temperature_sensor_ll_set_th_low_val(uint8_t th_low)
{
APB_SARADC.tsens_wake.saradc_wakeup_th_low = th_low;
HAL_FORCE_MODIFY_U32_REG_FIELD(APB_SARADC.tsens_wake, saradc_wakeup_th_low, th_low);
}
/**
@@ -193,7 +193,7 @@ static inline void temperature_sensor_ll_set_th_low_val(uint8_t th_low)
*/
static inline void temperature_sensor_ll_set_th_high_val(uint8_t th_high)
{
APB_SARADC.tsens_wake.saradc_wakeup_th_high = th_high;
HAL_FORCE_MODIFY_U32_REG_FIELD(APB_SARADC.tsens_wake, saradc_wakeup_th_high, th_high);
}
/**