diff --git a/components/driver/Kconfig b/components/driver/Kconfig index 4936d2fc73..ad4e8c4500 100644 --- a/components/driver/Kconfig +++ b/components/driver/Kconfig @@ -20,6 +20,12 @@ 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 @@ -137,6 +143,12 @@ menu "Driver Configurations" (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. + config TEMP_SENSOR_ENABLE_DEBUG_LOG bool "Enable debug log" default n @@ -192,6 +204,12 @@ 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 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. + config SDM_ENABLE_DEBUG_LOG bool "Enable debug log" default n @@ -248,6 +266,12 @@ menu "Driver Configurations" help Enable this option will suppress the deprecation warnings of using APIs in legacy I2S driver. + 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. + config I2S_ENABLE_DEBUG_LOG bool "Enable I2S debug log" default n @@ -300,6 +324,12 @@ menu "Driver Configurations" Only disable this option when you decide to do this step by yourself. Note that the driver will allocate a new piece of memory to save the converted data. + 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 # DAC Configuration menu "USB Serial/JTAG Configuration" diff --git a/components/driver/deprecated/adc_dma_legacy.c b/components/driver/deprecated/adc_dma_legacy.c index 6246620bb3..6ec98a1152 100644 --- a/components/driver/deprecated/adc_dma_legacy.c +++ b/components/driver/deprecated/adc_dma_legacy.c @@ -572,6 +572,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 */ @@ -587,6 +588,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 9afbf4fec5..7ffd00445a 100644 --- a/components/driver/deprecated/adc_legacy.c +++ b/components/driver/deprecated/adc_legacy.c @@ -917,6 +917,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 */ @@ -932,6 +933,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 988c69b25d..c249a149ce 100644 --- a/components/driver/deprecated/dac_common_legacy.c +++ b/components/driver/deprecated/dac_common_legacy.c @@ -129,6 +129,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 */ @@ -144,3 +145,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 bfbb850b56..0bc174b324 100644 --- a/components/driver/deprecated/i2s_legacy.c +++ b/components/driver/deprecated/i2s_legacy.c @@ -1900,6 +1900,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 */ @@ -1913,3 +1914,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 7b04532c3c..ea30a07dd0 100644 --- a/components/driver/deprecated/mcpwm_legacy.c +++ b/components/driver/deprecated/mcpwm_legacy.c @@ -1042,6 +1042,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 */ @@ -1057,3 +1058,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 630fced4f3..a424a5aed7 100644 --- a/components/driver/deprecated/pcnt_legacy.c +++ b/components/driver/deprecated/pcnt_legacy.c @@ -555,6 +555,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 */ @@ -570,3 +571,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 b67e250256..53426c0cc3 100644 --- a/components/driver/deprecated/rmt_legacy.c +++ b/components/driver/deprecated/rmt_legacy.c @@ -1390,6 +1390,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 */ @@ -1405,3 +1406,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 7df292bdf3..7ab2f92bda 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/gptimer/Kconfig.gptimer b/components/driver/gptimer/Kconfig.gptimer index 5aeda6fd04..c6ca8b8979 100644 --- a/components/driver/gptimer/Kconfig.gptimer +++ b/components/driver/gptimer/Kconfig.gptimer @@ -30,6 +30,12 @@ menu "GPTimer Configuration" 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. + config GPTIMER_ENABLE_DEBUG_LOG bool "Enable debug log" default n diff --git a/components/driver/i2c/i2c.c b/components/driver/i2c/i2c.c index dee0445852..e8b6353935 100644 --- a/components/driver/i2c/i2c.c +++ b/components/driver/i2c/i2c.c @@ -1676,6 +1676,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 */ @@ -1691,3 +1692,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/mcpwm/Kconfig.mcpwm b/components/driver/mcpwm/Kconfig.mcpwm index 2c6adddd70..c8dc111292 100644 --- a/components/driver/mcpwm/Kconfig.mcpwm +++ b/components/driver/mcpwm/Kconfig.mcpwm @@ -30,4 +30,10 @@ menu "MCPWM Configuration" help Wether to enable the debug log message for MCPWM driver. Note that, this option only controls the MCPWM driver log, won't affect other drivers. + + 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 # MCPWM Configuration diff --git a/components/driver/pcnt/Kconfig.pcnt b/components/driver/pcnt/Kconfig.pcnt index 4a01e45141..aad6366958 100644 --- a/components/driver/pcnt/Kconfig.pcnt +++ b/components/driver/pcnt/Kconfig.pcnt @@ -23,6 +23,12 @@ menu "PCNT Configuration" 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. + config PCNT_ENABLE_DEBUG_LOG bool "Enable debug log" default n diff --git a/components/driver/rmt/Kconfig.rmt b/components/driver/rmt/Kconfig.rmt index 97ea9c02b4..aaaf37b7d9 100644 --- a/components/driver/rmt/Kconfig.rmt +++ b/components/driver/rmt/Kconfig.rmt @@ -26,6 +26,12 @@ menu "RMT Configuration" 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. + config RMT_ENABLE_DEBUG_LOG bool "Enable debug log" default n