From 2bb9fb267fea88dd4e9a75d223fd50ad3d2e9020 Mon Sep 17 00:00:00 2001 From: laokaiyao Date: Fri, 24 Jan 2025 10:34:44 +0800 Subject: [PATCH] fix(i2s): fix uninitialize warning for the default macros Closes https://github.com/espressif/esp-idf/issues/15271 --- .../esp_driver_i2s/include/driver/i2s_std.h | 17 ++++++++++++++++- .../esp_driver_i2s/include/driver/i2s_tdm.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/components/esp_driver_i2s/include/driver/i2s_std.h b/components/esp_driver_i2s/include/driver/i2s_std.h index 263b69b7d4..85cb06ab0b 100644 --- a/components/esp_driver_i2s/include/driver/i2s_std.h +++ b/components/esp_driver_i2s/include/driver/i2s_std.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -193,6 +193,7 @@ extern "C" { I2S_STD_PHILIPS_SLOT_DEFAULT_CONFIG(bits_per_sample, mono_or_stereo) // Alias /** @endcond */ +#if SOC_I2S_HW_VERSION_1 /** * @brief I2S default standard clock configuration * @note Please set the mclk_multiple to I2S_MCLK_MULTIPLE_384 while using 24 bits data width @@ -204,6 +205,20 @@ extern "C" { .clk_src = I2S_CLK_SRC_DEFAULT, \ .mclk_multiple = I2S_MCLK_MULTIPLE_256, \ } +#else +/** + * @brief I2S default standard clock configuration + * @note Please set the mclk_multiple to I2S_MCLK_MULTIPLE_384 while using 24 bits data width + * Otherwise the sample rate might be imprecise since the BCLK division is not a integer + * @param rate sample rate + */ +#define I2S_STD_CLK_DEFAULT_CONFIG(rate) { \ + .sample_rate_hz = rate, \ + .clk_src = I2S_CLK_SRC_DEFAULT, \ + .mclk_multiple = I2S_MCLK_MULTIPLE_256, \ + .ext_clk_freq_hz = 0, \ +} +#endif /** * @brief I2S slot configuration for standard mode diff --git a/components/esp_driver_i2s/include/driver/i2s_tdm.h b/components/esp_driver_i2s/include/driver/i2s_tdm.h index a7a911b61d..ae07a24475 100644 --- a/components/esp_driver_i2s/include/driver/i2s_tdm.h +++ b/components/esp_driver_i2s/include/driver/i2s_tdm.h @@ -122,6 +122,7 @@ extern "C" { #define I2S_TDM_CLK_DEFAULT_CONFIG(rate) { \ .sample_rate_hz = rate, \ .clk_src = I2S_CLK_SRC_DEFAULT, \ + .ext_clk_freq_hz = 0, \ .mclk_multiple = I2S_MCLK_MULTIPLE_256, \ .bclk_div = 8, \ }