From 3a35c57824351a30b21284a9eb28e89bb8edb989 Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Fri, 22 May 2026 10:41:24 +0800 Subject: [PATCH] fix(isp): fix typo in CONFIG_ISP_ISR_IRAM_SAFE macro reference SAEE -> SAFE in isp_ae.c, causing the IRAM safety check to never trigger regardless of the Kconfig setting. --- components/esp_driver_isp/include/driver/isp_ae.h | 4 ++-- components/esp_driver_isp/src/isp_ae.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/esp_driver_isp/include/driver/isp_ae.h b/components/esp_driver_isp/include/driver/isp_ae.h index be8c471bdfd..16ff710705d 100644 --- a/components/esp_driver_isp/include/driver/isp_ae.h +++ b/components/esp_driver_isp/include/driver/isp_ae.h @@ -194,7 +194,7 @@ typedef bool (*esp_isp_ae_env_detector_callback_t)(isp_ae_ctlr_t ae_ctlr, const /** * @brief Group of ISP AE env_detector * @note These callbacks are all running in an ISR environment. - * @note When CONFIG_ISP_ISR_IRAM_SAEE is enabled, the callback itself and functions called by it should be placed in IRAM. + * @note When CONFIG_ISP_ISR_IRAM_SAFE is enabled, the callback itself and functions called by it should be placed in IRAM. * Involved variables should be in internal RAM as well. */ typedef struct { @@ -207,7 +207,7 @@ typedef struct { * * @note User can deregister a previously registered callback by calling this function and setting the to-be-deregistered callback member in * the `cbs` structure to NULL. - * @note When CONFIG_ISP_ISR_IRAM_SAEE is enabled, the callback itself and functions called by it should be placed in IRAM. + * @note When CONFIG_ISP_ISR_IRAM_SAFE is enabled, the callback itself and functions called by it should be placed in IRAM. * Involved variables (including `user_data`) should be in internal RAM as well. * * @param[in] ae_ctlr AE controller handle diff --git a/components/esp_driver_isp/src/isp_ae.c b/components/esp_driver_isp/src/isp_ae.c index 26799ae7e66..9033b80d544 100644 --- a/components/esp_driver_isp/src/isp_ae.c +++ b/components/esp_driver_isp/src/isp_ae.c @@ -233,7 +233,7 @@ esp_err_t esp_isp_ae_env_detector_register_event_callbacks(isp_ae_ctlr_t ae_ctlr ESP_RETURN_ON_FALSE(ae_ctlr && cbs, ESP_ERR_INVALID_ARG, TAG, "invalid argument"); ESP_RETURN_ON_FALSE(atomic_load(&ae_ctlr->fsm) == ISP_FSM_INIT, ESP_ERR_INVALID_STATE, TAG, "controller not in init state"); -#if CONFIG_ISP_ISR_IRAM_SAEE +#if CONFIG_ISP_ISR_IRAM_SAFE if (cbs->on_env_statistics_done) { ESP_RETURN_ON_FALSE(esp_ptr_in_iram(cbs->on_env_statistics_done), ESP_ERR_INVALID_ARG, TAG, "on_env_statistics_done callback not in IRAM"); }