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

Merge branch 'bugfix/delete_i2c_cmd_mux_semaphore_more_cleanly_v4.3' into 'release/v4.3'

Browse Source 
driver/i2c: delete i2c cmd_mux semaphore more cleanly (backport 4.3)

See merge request espressif/esp-idf!13400
This commit is contained in:
Michael (XIAO Xufeng)
2021-07-02 10:58:38 +00:00
parent 6e05a56713 5f184c6556
commit 2ac59cc885
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/driver/i2c.c
View File

@ -400,7 +400,9 @@ esp_err_t i2c_driver_delete(i2c_port_t i2c_num)
p_i2c->intr_handle = NULL; p_i2c->intr_handle = NULL;
if (p_i2c->cmd_mux) { if (p_i2c->cmd_mux) {
// Let any command in progress finish.
xSemaphoreTake(p_i2c->cmd_mux, portMAX_DELAY); xSemaphoreTake(p_i2c->cmd_mux, portMAX_DELAY);
xSemaphoreGive(p_i2c->cmd_mux);
vSemaphoreDelete(p_i2c->cmd_mux); vSemaphoreDelete(p_i2c->cmd_mux);
} }
if (p_i2c_obj[i2c_num]->cmd_evt_queue) { if (p_i2c_obj[i2c_num]->cmd_evt_queue) {

3
components/driver/include/driver/i2c.h
View File

@ -67,6 +67,9 @@ esp_err_t i2c_driver_install(i2c_port_t i2c_num, i2c_mode_t mode, size_t slv_rx_
/** /**
* @brief I2C driver delete * @brief I2C driver delete
* *
* @note This function does not guarantee thread safety.
* Please make sure that no thread will continuously hold semaphores before calling the delete function.
*
* @param i2c_num I2C port number * @param i2c_num I2C port number
* *
* @return * @return

1
docs/en/api-reference/peripherals/i2c.rst
View File

@ -358,6 +358,7 @@ Delete Driver
When the I2C communication is established with the function :cpp:func:`i2c_driver_install` and is not required for some substantial amount of time, the driver may be deinitialized to release allocated resources by calling :cpp:func:`i2c_driver_delete`. When the I2C communication is established with the function :cpp:func:`i2c_driver_install` and is not required for some substantial amount of time, the driver may be deinitialized to release allocated resources by calling :cpp:func:`i2c_driver_delete`.
Before calling :cpp:func:`i2c_driver_delete` to remove i2c driver, please make sure that all threads have stopped using the driver in any way, because this function does not guarantee thread safety.
Application Example Application Example
------------------- -------------------