alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-10 04:43:33 +00: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

9
components/hal/esp32s2/include/hal/temperature_sensor_ll.h
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -21,6 +21,7 @@
#include "soc/rtc_cntl_reg.h"
#include "soc/sens_struct.h"
#include "hal/temperature_sensor_types.h"
#include "hal/misc.h"
#ifdef __cplusplus
extern "C" {
@@ -82,7 +83,7 @@ static inline uint32_t temperature_sensor_ll_get_raw_value(void)
while (!SENS.sar_tctrl.tsens_ready) {
}
SENS.sar_tctrl.tsens_dump_out = 0;
return SENS.sar_tctrl.tsens_out;
return HAL_FORCE_READ_U32_REG_FIELD(SENS.sar_tctrl, tsens_out);
}
/**
@@ -106,7 +107,7 @@ static inline uint32_t temperature_sensor_ll_get_offset(void)
*/
static inline uint32_t temperature_sensor_ll_get_clk_div(void)
{
return SENS.sar_tctrl.tsens_clk_div;
return HAL_FORCE_READ_U32_REG_FIELD(SENS.sar_tctrl, tsens_clk_div);
}
/**
@@ -119,7 +120,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)
{
SENS.sar_tctrl.tsens_clk_div = clk_div;
HAL_FORCE_MODIFY_U32_REG_FIELD(SENS.sar_tctrl, tsens_clk_div, clk_div);
}
#ifdef __cplusplus