Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(i2c/gpio): Add error checks to the i2c driver (Backport v5.5)

Browse Source 
Add more checks to i2c driver, as well as fixed some GPIO issues
together with it.
This commit is contained in:
Chen Chen
2025-10-17 15:12:51 +08:00
parent 31bae90a13
commit 52a378272f
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_driver_gpio/src/rtc_io.c
+12 -3
View File
@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2019-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -16,6 +16,9 @@
#include "hal/rtc_io_hal.h" #include "hal/rtc_io_hal.h"
#include "soc/rtc_io_periph.h" #include "soc/rtc_io_periph.h"
#include "soc/soc_caps.h" #include "soc/soc_caps.h"
#if SOC_LP_GPIO_MATRIX_SUPPORTED
#include "soc/lp_gpio_pins.h"
#endif
static const char __attribute__((__unused__)) *RTCIO_TAG = "RTCIO"; static const char __attribute__((__unused__)) *RTCIO_TAG = "RTCIO";
@@ -181,8 +184,14 @@ esp_err_t rtc_gpio_iomux_func_sel(gpio_num_t gpio_num, int func)
#if SOC_LP_GPIO_MATRIX_SUPPORTED #if SOC_LP_GPIO_MATRIX_SUPPORTED
esp_err_t lp_gpio_connect_in_signal(gpio_num_t gpio_num, uint32_t signal_idx, bool inv) esp_err_t lp_gpio_connect_in_signal(gpio_num_t gpio_num, uint32_t signal_idx, bool inv)
{ {
ESP_RETURN_ON_FALSE(rtc_gpio_is_valid_gpio(gpio_num), ESP_ERR_INVALID_ARG, RTCIO_TAG, "LP_IO number error"); uint32_t io_num;
rtcio_hal_matrix_in(rtc_io_number_get(gpio_num), signal_idx, inv); if (gpio_num == LP_GPIO_MATRIX_CONST_ZERO_INPUT || gpio_num == LP_GPIO_MATRIX_CONST_ONE_INPUT) {
io_num = gpio_num;
} else {
ESP_RETURN_ON_FALSE(rtc_gpio_is_valid_gpio(gpio_num), ESP_ERR_INVALID_ARG, RTCIO_TAG, "LP_IO number error");
io_num = rtc_io_number_get(gpio_num);
}
rtcio_hal_matrix_in(io_num, signal_idx, inv);
return ESP_OK; return ESP_OK;
} }
components/esp_driver_i2c/i2c_common.c
+2 -2
View File
@@ -431,8 +431,8 @@ esp_err_t i2c_common_deinit_pins(i2c_bus_handle_t handle)
ESP_RETURN_ON_ERROR(rtc_gpio_deinit(handle->sda_num), TAG, "deinit rtc gpio failed"); ESP_RETURN_ON_ERROR(rtc_gpio_deinit(handle->sda_num), TAG, "deinit rtc gpio failed");
ESP_RETURN_ON_ERROR(rtc_gpio_deinit(handle->scl_num), TAG, "deinit rtc gpio failed"); ESP_RETURN_ON_ERROR(rtc_gpio_deinit(handle->scl_num), TAG, "deinit rtc gpio failed");
#if SOC_LP_GPIO_MATRIX_SUPPORTED #if SOC_LP_GPIO_MATRIX_SUPPORTED
lp_gpio_connect_in_signal(LP_GPIO_MATRIX_CONST_ZERO_INPUT, i2c_periph_signal[port_id].scl_in_sig, 0); ESP_RETURN_ON_ERROR(lp_gpio_connect_in_signal(LP_GPIO_MATRIX_CONST_ZERO_INPUT, i2c_periph_signal[port_id].scl_in_sig, 0), TAG, "failed to connect lp gpio to zero");
lp_gpio_connect_in_signal(LP_GPIO_MATRIX_CONST_ZERO_INPUT, i2c_periph_signal[port_id].sda_in_sig, 0); ESP_RETURN_ON_ERROR(lp_gpio_connect_in_signal(LP_GPIO_MATRIX_CONST_ZERO_INPUT, i2c_periph_signal[port_id].sda_in_sig, 0), TAG, "failed to connect lp gpio to zero");
#endif #endif
} }
#endif #endif
components/esp_driver_i2c/i2c_master.c
+1 -1
View File
@@ -814,7 +814,7 @@ static esp_err_t i2c_master_bus_destroy(i2c_master_bus_handle_t bus_handle)
i2c_master_bus_handle_t i2c_master = bus_handle; i2c_master_bus_handle_t i2c_master = bus_handle;
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
if (i2c_master->base) { if (i2c_master->base) {
i2c_common_deinit_pins(i2c_master->base); ESP_RETURN_ON_ERROR(i2c_common_deinit_pins(i2c_master->base), TAG, "failed to deinit i2c pins");
err = i2c_release_bus_handle(i2c_master->base); err = i2c_release_bus_handle(i2c_master->base);
} }
if (err == ESP_OK) { if (err == ESP_OK) {