feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

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

Browse Source 
fix(ulp-i2c): fixed ulp i2c not working from main cpu if compiled with 0S or O2 (v5.1)

See merge request espressif/esp-idf!25947
This commit is contained in:
Marius Vikhammer
2023-09-15 08:09:03 +08:00
parent 667b83db0e c7532e27fa
commit 6609e5e785
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/ulp/ulp_riscv/ulp_riscv_i2c.c
View File

@@ -12,6 +12,7 @@
#include "soc/sens_reg.h" #include "soc/sens_reg.h"
#include "soc/clk_tree_defs.h" #include "soc/clk_tree_defs.h"
#include "hal/i2c_ll.h" #include "hal/i2c_ll.h"
#include "hal/misc.h"
#include "driver/rtc_io.h" #include "driver/rtc_io.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
@@ -215,7 +216,8 @@ static void ulp_riscv_i2c_format_cmd(uint32_t cmd_idx, uint8_t op_code, uint8_t
i2c_dev->command[cmd_idx].ack_en = ack_check_en; // I2C controller verifies that the ACK bit sent by the i2c_dev->command[cmd_idx].ack_en = ack_check_en; // I2C controller verifies that the ACK bit sent by the
// slave device matches the ACK expected bit during WRITE. // slave device matches the ACK expected bit during WRITE.
// Ignored during RSTART, STOP, END and READ cmds. // Ignored during RSTART, STOP, END and READ cmds.
i2c_dev->command[cmd_idx].byte_num = byte_num; // Byte Num HAL_FORCE_MODIFY_U32_REG_FIELD(i2c_dev->command[cmd_idx], byte_num, byte_num); // Byte Num
#elif CONFIG_IDF_TARGET_ESP32S3 #elif CONFIG_IDF_TARGET_ESP32S3
/* Reset cmd register */ /* Reset cmd register */
i2c_dev->i2c_cmd[cmd_idx].val = 0; i2c_dev->i2c_cmd[cmd_idx].val = 0;
@@ -230,7 +232,7 @@ static void ulp_riscv_i2c_format_cmd(uint32_t cmd_idx, uint8_t op_code, uint8_t
i2c_dev->i2c_cmd[cmd_idx].i2c_ack_en = ack_check_en; // I2C controller verifies that the ACK bit sent by the i2c_dev->i2c_cmd[cmd_idx].i2c_ack_en = ack_check_en; // I2C controller verifies that the ACK bit sent by the
// slave device matches the ACK expected bit during WRITE. // slave device matches the ACK expected bit during WRITE.
// Ignored during RSTART, STOP, END and READ cmds. // Ignored during RSTART, STOP, END and READ cmds.
i2c_dev->i2c_cmd[cmd_idx].i2c_byte_num = byte_num; // Byte Num HAL_FORCE_MODIFY_U32_REG_FIELD(i2c_dev->i2c_cmd[cmd_idx], i2c_byte_num, byte_num); // Byte Num
#endif // CONFIG_IDF_TARGET_ESP32S2 #endif // CONFIG_IDF_TARGET_ESP32S2
} }