diff --git a/components/driver/Kconfig b/components/driver/Kconfig index 68634c78f9..2e9d2ac205 100644 --- a/components/driver/Kconfig +++ b/components/driver/Kconfig @@ -22,6 +22,11 @@ menu "Driver Configurations" If you want to continue using the legacy driver, and don't want to see related deprecation warnings, you can enable this option. + config ADC_SKIP_LEGACY_CONFLICT_CHECK + bool "Skip legacy conflict check" + default n + help + This configuration option allows the user to bypass the conflict check mechanism with legacy code. menu "Legacy ADC Calibration Configuration" config ADC_CAL_EFUSE_TP_ENABLE @@ -72,6 +77,12 @@ menu "Driver Configurations" Whether to suppress the deprecation warnings when using legacy dac driver (driver/dac.h). If you want to continue using the legacy driver, and don't want to see related deprecation warnings, you can enable this option. + + config DAC_SKIP_LEGACY_CONFLICT_CHECK + bool "Skip legacy conflict check" + default n + help + This configuration option allows the user to bypass the conflict check mechanism with legacy code. endmenu # Legacy DAC Driver Configurations menu "Legacy MCPWM Driver Configurations" @@ -83,6 +94,12 @@ menu "Driver Configurations" Whether to suppress the deprecation warnings when using legacy MCPWM driver (driver/mcpwm.h). If you want to continue using the legacy driver, and don't want to see related deprecation warnings, you can enable this option. + + config MCPWM_SKIP_LEGACY_CONFLICT_CHECK + bool "Skip legacy conflict check" + default n + help + This configuration option allows the user to bypass the conflict check mechanism with legacy code. endmenu # Legacy MCPWM Driver Configurations menu "Legacy Timer Group Driver Configurations" @@ -95,6 +112,11 @@ menu "Driver Configurations" If you want to continue using the legacy driver, and don't want to see related deprecation warnings, you can enable this option. + config GPTIMER_SKIP_LEGACY_CONFLICT_CHECK + bool "Skip legacy conflict check" + default n + help + This configuration option allows the user to bypass the conflict check mechanism with legacy code. endmenu # Legacy Timer Group Driver Configurations menu "Legacy RMT Driver Configurations" @@ -106,6 +128,12 @@ menu "Driver Configurations" Whether to suppress the deprecation warnings when using legacy rmt driver (driver/rmt.h). If you want to continue using the legacy driver, and don't want to see related deprecation warnings, you can enable this option. + + config RMT_SKIP_LEGACY_CONFLICT_CHECK + bool "Skip legacy conflict check" + default n + help + This configuration option allows the user to bypass the conflict check mechanism with legacy code. endmenu # Legacy RMT Driver Configurations menu "Legacy I2S Driver Configurations" @@ -117,6 +145,12 @@ menu "Driver Configurations" Whether to suppress the deprecation warnings when using legacy i2s driver (driver/i2s.h). If you want to continue using the legacy driver, and don't want to see related deprecation warnings, you can enable this option. + + config I2S_SKIP_LEGACY_CONFLICT_CHECK + bool "Skip legacy conflict check" + default n + help + This configuration option allows the user to bypass the conflict check mechanism with legacy code. endmenu # Legacy I2S Driver Configurationss menu "Legacy PCNT Driver Configurations" @@ -128,6 +162,12 @@ menu "Driver Configurations" whether to suppress the deprecation warnings when using legacy PCNT driver (driver/pcnt.h). If you want to continue using the legacy driver, and don't want to see related deprecation warnings, you can enable this option. + + config PCNT_SKIP_LEGACY_CONFLICT_CHECK + bool "Skip legacy conflict check" + default n + help + This configuration option allows the user to bypass the conflict check mechanism with legacy code. endmenu # Legacy PCNT Driver Configurationss menu "Legacy SDM Driver Configurations" @@ -139,6 +179,12 @@ menu "Driver Configurations" whether to suppress the deprecation warnings when using legacy SDM driver (driver/sigmadelta.h). If you want to continue using the legacy driver, and don't want to see related deprecation warnings, you can enable this option. + + config SDM_SKIP_LEGACY_CONFLICT_CHECK + bool "Skip legacy conflict check" + default n + help + This configuration option allows the user to bypass the conflict check mechanism with legacy code. endmenu # Legacy SDM Driver Configurationss menu "Legacy Temperature Sensor Driver Configurations" @@ -150,6 +196,12 @@ menu "Driver Configurations" whether to suppress the deprecation warnings when using legacy temperature sensor driver (driver/temp_sensor.h). If you want to continue using the legacy driver, and don't want to see related deprecation warnings, you can enable this option. + + config TEMP_SENSOR_SKIP_LEGACY_CONFLICT_CHECK + bool "Skip legacy conflict check" + default n + help + This configuration option allows the user to bypass the conflict check mechanism with legacy code. endmenu # Legacy Temperature Sensor Driver Configurationss endmenu # Driver configurations diff --git a/components/driver/deprecated/adc_dma_legacy.c b/components/driver/deprecated/adc_dma_legacy.c index 04eb8c9024..73544e03dd 100644 --- a/components/driver/deprecated/adc_dma_legacy.c +++ b/components/driver/deprecated/adc_dma_legacy.c @@ -621,6 +621,7 @@ esp_err_t adc_digi_controller_configure(const adc_digi_configuration_t *config) return ESP_OK; } +#if !CONFIG_ADC_SKIP_LEGACY_CONFLICT_CHECK /** * @brief This function will be called during start up, to check that adc_continuous driver is not running along with the legacy adc_continuous driver */ @@ -636,6 +637,7 @@ static void check_adc_continuous_driver_conflict(void) } ESP_EARLY_LOGW(ADC_TAG, "legacy driver is deprecated, please migrate to `esp_adc/adc_continuous.h`"); } +#endif //CONFIG_ADC_SKIP_LEGACY_CONFLICT_CHECK #if SOC_ADC_CALIBRATION_V1_SUPPORTED /*--------------------------------------------------------------- diff --git a/components/driver/deprecated/adc_legacy.c b/components/driver/deprecated/adc_legacy.c index 76277ac5e5..9192f29503 100644 --- a/components/driver/deprecated/adc_legacy.c +++ b/components/driver/deprecated/adc_legacy.c @@ -912,6 +912,7 @@ static esp_err_t adc_hal_convert(adc_unit_t adc_n, int channel, uint32_t clk_src return ESP_OK; } +#if !CONFIG_ADC_SKIP_LEGACY_CONFLICT_CHECK /** * @brief This function will be called during start up, to check that adc_oneshot driver is not running along with the legacy adc oneshot driver */ @@ -927,6 +928,7 @@ static void check_adc_oneshot_driver_conflict(void) } ESP_EARLY_LOGW(ADC_TAG, "legacy driver is deprecated, please migrate to `esp_adc/adc_oneshot.h`"); } +#endif //CONFIG_ADC_SKIP_LEGACY_CONFLICT_CHECK #if SOC_ADC_CALIBRATION_V1_SUPPORTED /*--------------------------------------------------------------- diff --git a/components/driver/deprecated/dac_common_legacy.c b/components/driver/deprecated/dac_common_legacy.c index 0a990c286d..603363e42f 100644 --- a/components/driver/deprecated/dac_common_legacy.c +++ b/components/driver/deprecated/dac_common_legacy.c @@ -128,6 +128,7 @@ esp_err_t dac_cw_generator_config(dac_cw_config_t *cw) return ESP_OK; } +#if !CONFIG_DAC_SKIP_LEGACY_CONFLICT_CHECK /** * @brief This function will be called during start up, to check that this legacy DAC driver is not running along with the new driver */ @@ -143,3 +144,4 @@ static void check_dac_legacy_driver_conflict(void) } ESP_EARLY_LOGW(TAG, "legacy driver is deprecated, please migrate to `driver/dac_oneshot.h`, `driver/dac_cosine.h` or `driver/dac_continuous.h` instead"); } +#endif //CONFIG_DAC_SKIP_LEGACY_CONFLICT_CHECK diff --git a/components/driver/deprecated/i2s_legacy.c b/components/driver/deprecated/i2s_legacy.c index 352e1f03f9..fcac727214 100644 --- a/components/driver/deprecated/i2s_legacy.c +++ b/components/driver/deprecated/i2s_legacy.c @@ -1961,6 +1961,7 @@ esp_err_t i2s_set_pin(i2s_port_t i2s_num, const i2s_pin_config_t *pin) return ESP_OK; } +#if !CONFIG_I2S_SKIP_LEGACY_CONFLICT_CHECK /** * @brief This function will be called during start up, to check that the new i2s driver is not running along with the legacy i2s driver */ @@ -1974,3 +1975,4 @@ static __attribute__((constructor)) void check_i2s_driver_conflict(void) } ESP_EARLY_LOGW(TAG, "legacy i2s driver is deprecated, please migrate to use driver/i2s_std.h, driver/i2s_pdm.h or driver/i2s_tdm.h"); } +#endif //CONFIG_I2S_SKIP_LEGACY_CONFLICT_CHECK diff --git a/components/driver/deprecated/mcpwm_legacy.c b/components/driver/deprecated/mcpwm_legacy.c index b2efec86f1..26e53d3a3d 100644 --- a/components/driver/deprecated/mcpwm_legacy.c +++ b/components/driver/deprecated/mcpwm_legacy.c @@ -1047,6 +1047,7 @@ esp_err_t mcpwm_set_timer_sync_output(mcpwm_unit_t mcpwm_num, mcpwm_timer_t time return ESP_OK; } +#if !CONFIG_MCPWM_SKIP_LEGACY_CONFLICT_CHECK /** * @brief This function will be called during start up, to check that this legacy mcpwm driver is not running along with the new MCPWM driver */ @@ -1062,3 +1063,4 @@ static void check_mcpwm_driver_conflict(void) } ESP_EARLY_LOGW(TAG, "legacy driver is deprecated, please migrate to `driver/mcpwm_prelude.h`"); } +#endif //CONFIG_MCPWM_SKIP_LEGACY_CONFLICT_CHECK diff --git a/components/driver/deprecated/pcnt_legacy.c b/components/driver/deprecated/pcnt_legacy.c index 1c33b4aa77..a5c2d2837e 100644 --- a/components/driver/deprecated/pcnt_legacy.c +++ b/components/driver/deprecated/pcnt_legacy.c @@ -554,6 +554,7 @@ void pcnt_isr_service_uninstall(void) _pcnt_isr_service_uninstall(PCNT_PORT_0); } +#if !CONFIG_PCNT_SKIP_LEGACY_CONFLICT_CHECK /** * @brief This function will be called during start up, to check that pulse_cnt driver is not running along with the legacy pcnt driver */ @@ -569,3 +570,4 @@ static void check_pcnt_driver_conflict(void) } ESP_EARLY_LOGW(TAG, "legacy driver is deprecated, please migrate to `driver/pulse_cnt.h`"); } +#endif //CONFIG_PCNT_SKIP_LEGACY_CONFLICT_CHECK diff --git a/components/driver/deprecated/rmt_legacy.c b/components/driver/deprecated/rmt_legacy.c index 4269c8fa56..78286c44f5 100644 --- a/components/driver/deprecated/rmt_legacy.c +++ b/components/driver/deprecated/rmt_legacy.c @@ -1391,6 +1391,7 @@ esp_err_t rmt_enable_tx_loop_autostop(rmt_channel_t channel, bool en) } #endif +#if !CONFIG_RMT_SKIP_LEGACY_CONFLICT_CHECK /** * @brief This function will be called during start up, to check that this legacy RMT driver is not running along with the new driver */ @@ -1406,3 +1407,4 @@ static void check_rmt_legacy_driver_conflict(void) } ESP_EARLY_LOGW(TAG, "legacy driver is deprecated, please migrate to `driver/rmt_tx.h` and/or `driver/rmt_rx.h`"); } +#endif //CONFIG_RMT_SKIP_LEGACY_CONFLICT_CHECK diff --git a/components/driver/deprecated/rtc_temperature_legacy.c b/components/driver/deprecated/rtc_temperature_legacy.c index 97e700fa80..e1830dc3f9 100644 --- a/components/driver/deprecated/rtc_temperature_legacy.c +++ b/components/driver/deprecated/rtc_temperature_legacy.c @@ -152,6 +152,7 @@ esp_err_t temp_sensor_read_celsius(float *celsius) return ESP_OK; } +#if !CONFIG_TEMP_SENSOR_SKIP_LEGACY_CONFLICT_CHECK /** * @brief This function will be called during start up, to check that this legacy temp sensor driver is not running along with the new driver */ @@ -167,3 +168,4 @@ static void check_legacy_temp_sensor_driver_conflict(void) } ESP_EARLY_LOGW(TAG, "legacy driver is deprecated, please migrate to `driver/temperature_sensor.h`"); } +#endif //CONFIG_TEMP_SENSOR_SKIP_LEGACY_CONFLICT_CHECK diff --git a/components/driver/deprecated/sigma_delta_legacy.c b/components/driver/deprecated/sigma_delta_legacy.c index 96c8f45d79..f5921c6437 100644 --- a/components/driver/deprecated/sigma_delta_legacy.c +++ b/components/driver/deprecated/sigma_delta_legacy.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -128,3 +128,21 @@ esp_err_t sigmadelta_config(const sigmadelta_config_t *config) } return _sigmadelta_config(SIGMADELTA_PORT_0, config); } + +#if !CONFIG_SDM_SKIP_LEGACY_CONFLICT_CHECK +/** + * @brief This function will be called during start up, to check that sdm driver is not running along with the legacy sdm driver + */ +__attribute__((constructor)) +static void check_sdm_driver_conflict(void) +{ + // This function was declared as weak here. sdm driver has one implementation. + // So if sdm driver is not linked in, then `sdm_new_channel` should be NULL at runtime. + extern __attribute__((weak)) esp_err_t sdm_new_channel(const void *config, void **ret_unit); + if ((void *)sdm_new_channel != NULL) { + ESP_EARLY_LOGE(TAG, "CONFLICT! driver_ng is not allowed to be used with the legacy driver"); + abort(); + } + ESP_EARLY_LOGW(TAG, "legacy driver is deprecated, please migrate to `driver/sdm.h`"); +} +#endif //CONFIG_PCNT_SKIP_LEGACY_CONFLICT_CHECK diff --git a/components/driver/deprecated/timer_legacy.c b/components/driver/deprecated/timer_legacy.c index 08261f8dd1..020ba1d5fa 100644 --- a/components/driver/deprecated/timer_legacy.c +++ b/components/driver/deprecated/timer_legacy.c @@ -465,6 +465,7 @@ bool IRAM_ATTR timer_group_get_auto_reload_in_isr(timer_group_t group_num, timer return p_timer_obj[group_num][timer_num]->auto_reload_en; } +#if !CONFIG_GPTIMER_SKIP_LEGACY_CONFLICT_CHECK /** * @brief This function will be called during start up, to check that this legacy timer group driver is not running along with the gptimer driver */ @@ -480,3 +481,4 @@ static void check_legacy_timer_driver_conflict(void) } ESP_EARLY_LOGW(TIMER_TAG, "legacy driver is deprecated, please migrate to `driver/gptimer.h`"); } +#endif //CONFIG_GPTIMER_SKIP_LEGACY_CONFLICT_CHECK diff --git a/components/driver/i2c/i2c.c b/components/driver/i2c/i2c.c index 12f2a25d7b..872b8fbc98 100644 --- a/components/driver/i2c/i2c.c +++ b/components/driver/i2c/i2c.c @@ -1705,6 +1705,7 @@ int i2c_slave_read_buffer(i2c_port_t i2c_num, uint8_t *data, size_t max_size, Ti } #endif +#if !CONFIG_I2C_SKIP_LEGACY_CONFLICT_CHECK /** * @brief This function will be called during start up, to check that this legacy i2c driver is not running along with the new I2C driver */ @@ -1720,3 +1721,4 @@ static void check_i2c_driver_conflict(void) } ESP_EARLY_LOGW(I2C_TAG, "This driver is an old driver, please migrate your application code to adapt `driver/i2c_master.h`"); } +#endif //CONFIG_I2C_SKIP_LEGACY_CONFLICT_CHECK diff --git a/components/driver/test_apps/legacy_timer_driver/README.md b/components/driver/test_apps/legacy_timer_driver/README.md index 3a502b1f86..bf47d80ec6 100644 --- a/components/driver/test_apps/legacy_timer_driver/README.md +++ b/components/driver/test_apps/legacy_timer_driver/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |