From f0c13fc7a8a35db66aa8d0716cb76fd434498d0e Mon Sep 17 00:00:00 2001 From: laokaiyao Date: Wed, 26 Apr 2023 15:23:58 +0800 Subject: [PATCH 1/3] i2s_std: fixed mclk check for 24-bit data and enable left alignment as default --- components/driver/i2s/i2s_std.c | 4 +++- components/driver/include/driver/i2s_std.h | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/components/driver/i2s/i2s_std.c b/components/driver/i2s/i2s_std.c index 9939891509..32c591fca0 100644 --- a/components/driver/i2s/i2s_std.c +++ b/components/driver/i2s/i2s_std.c @@ -62,7 +62,9 @@ static esp_err_t i2s_std_set_clock(i2s_chan_handle_t handle, const i2s_std_clk_c { esp_err_t ret = ESP_OK; i2s_std_config_t *std_cfg = (i2s_std_config_t *)(handle->mode_info); - ESP_RETURN_ON_FALSE(std_cfg->slot_cfg.data_bit_width != I2S_DATA_BIT_WIDTH_24BIT || + i2s_data_bit_width_t real_slot_bit = (int)std_cfg->slot_cfg.slot_bit_width < (int)std_cfg->slot_cfg.data_bit_width ? + std_cfg->slot_cfg.data_bit_width : std_cfg->slot_cfg.slot_bit_width; + ESP_RETURN_ON_FALSE(real_slot_bit != I2S_DATA_BIT_WIDTH_24BIT || (clk_cfg->mclk_multiple % 3 == 0), ESP_ERR_INVALID_ARG, TAG, "The 'mclk_multiple' should be the multiple of 3 while using 24-bit data width"); diff --git a/components/driver/include/driver/i2s_std.h b/components/driver/include/driver/i2s_std.h index 1080019e96..6930e3b51a 100644 --- a/components/driver/include/driver/i2s_std.h +++ b/components/driver/include/driver/i2s_std.h @@ -145,7 +145,7 @@ extern "C" { .ws_width = bits_per_sample, \ .ws_pol = false, \ .bit_shift = true, \ - .left_align = false, \ + .left_align = true, \ .big_endian = false, \ .bit_order_lsb = false \ } @@ -164,7 +164,7 @@ extern "C" { .ws_width = 1, \ .ws_pol = true, \ .bit_shift = true, \ - .left_align = false, \ + .left_align = true, \ .big_endian = false, \ .bit_order_lsb = false \ } @@ -182,7 +182,7 @@ extern "C" { .ws_width = bits_per_sample, \ .ws_pol = false, \ .bit_shift = false, \ - .left_align = false, \ + .left_align = true, \ .big_endian = false, \ .bit_order_lsb = false \ } From 4dd5909b1393783f4d45a83986a4a00535c732a4 Mon Sep 17 00:00:00 2001 From: laokaiyao Date: Wed, 26 Apr 2023 22:39:43 +0800 Subject: [PATCH 2/3] i2s_tdm: fixed half sample bit calculation and add check for slot mask --- components/driver/i2s/i2s_tdm.c | 1 + components/hal/i2s_hal.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/driver/i2s/i2s_tdm.c b/components/driver/i2s/i2s_tdm.c index 18ef408a11..d7862d73c4 100644 --- a/components/driver/i2s/i2s_tdm.c +++ b/components/driver/i2s/i2s_tdm.c @@ -94,6 +94,7 @@ static esp_err_t i2s_tdm_set_clock(i2s_chan_handle_t handle, const i2s_tdm_clk_c static esp_err_t i2s_tdm_set_slot(i2s_chan_handle_t handle, const i2s_tdm_slot_config_t *slot_cfg) { + ESP_RETURN_ON_FALSE(slot_cfg->slot_mask, ESP_ERR_INVALID_ARG, TAG, "At least one channel should be enabled"); /* Update the total slot num and active slot num */ handle->active_slot = slot_cfg->slot_mode == I2S_SLOT_MODE_MONO ? 1 : __builtin_popcount(slot_cfg->slot_mask); uint32_t max_slot_num = 32 - __builtin_clz(slot_cfg->slot_mask); diff --git a/components/hal/i2s_hal.c b/components/hal/i2s_hal.c index 6c7f51e49f..869d79ca33 100644 --- a/components/hal/i2s_hal.c +++ b/components/hal/i2s_hal.c @@ -246,7 +246,7 @@ void i2s_hal_tdm_set_tx_slot(i2s_hal_context_t *hal, bool is_slave, const i2s_ha i2s_ll_tx_set_active_chan_mask(hal->dev, (slot_cfg->slot_mode == I2S_SLOT_MODE_MONO) ? I2S_TDM_SLOT0 : (uint32_t)slot_cfg->tdm.slot_mask); i2s_ll_tx_set_skip_mask(hal->dev, slot_cfg->tdm.skip_mask); - i2s_ll_tx_set_half_sample_bit(hal->dev, __builtin_popcount(slot_cfg->tdm.slot_mask) * slot_bit_width / 2); + i2s_ll_tx_set_half_sample_bit(hal->dev, total_slot * slot_bit_width / 2); i2s_ll_tx_set_bit_order(hal->dev, slot_cfg->tdm.bit_order_lsb); i2s_ll_tx_enable_left_align(hal->dev, slot_cfg->tdm.left_align); i2s_ll_tx_enable_big_endian(hal->dev, slot_cfg->tdm.big_endian); @@ -279,7 +279,7 @@ void i2s_hal_tdm_set_rx_slot(i2s_hal_context_t *hal, bool is_slave, const i2s_ha /* In mono mode, there only should be one slot enabled, other inactive slots will transmit same data as enabled slot */ i2s_ll_rx_set_active_chan_mask(hal->dev, (slot_cfg->slot_mode == I2S_SLOT_MODE_MONO) ? I2S_TDM_SLOT0 : (uint32_t)slot_cfg->tdm.slot_mask); - i2s_ll_rx_set_half_sample_bit(hal->dev, __builtin_popcount(slot_cfg->tdm.slot_mask) * slot_bit_width / 2); + i2s_ll_rx_set_half_sample_bit(hal->dev, total_slot * slot_bit_width / 2); i2s_ll_rx_set_bit_order(hal->dev, slot_cfg->tdm.bit_order_lsb); i2s_ll_rx_enable_left_align(hal->dev, slot_cfg->tdm.left_align); i2s_ll_rx_enable_big_endian(hal->dev, slot_cfg->tdm.big_endian); From 95d32520b1b45f5f48b1dfa44dd722cf852bb294 Mon Sep 17 00:00:00 2001 From: laokaiyao Date: Wed, 26 Apr 2023 22:50:53 +0800 Subject: [PATCH 3/3] i2s_doc: fixed the data of stereo left/right state --- docs/en/api-reference/peripherals/i2s.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/api-reference/peripherals/i2s.rst b/docs/en/api-reference/peripherals/i2s.rst index 6a7665ab6e..d590853d65 100644 --- a/docs/en/api-reference/peripherals/i2s.rst +++ b/docs/en/api-reference/peripherals/i2s.rst @@ -354,9 +354,9 @@ Here is the table of the real data on the line with different :cpp:member:`i2s_s | | +-----------+----------+----------+----------+----------+----------+----------+----------+----------+ | | | both | 0x0001 | 0x0001 | 0x0002 | 0x0002 | 0x0003 | 0x0003 | 0x0004 | 0x0004 | | +-----------+-----------+----------+----------+----------+----------+----------+----------+----------+----------+ - | | stereo | left | 0x0001 | 0x0001 | 0x0003 | 0x0003 | 0x0005 | 0x0005 | 0x0007 | 0x0007 | + | | stereo | left | 0x0001 | 0x0000 | 0x0003 | 0x0000 | 0x0005 | 0x0000 | 0x0007 | 0x0000 | | | +-----------+----------+----------+----------+----------+----------+----------+----------+----------+ - | | | right | 0x0002 | 0x0002 | 0x0004 | 0x0004 | 0x0006 | 0x0006 | 0x0008 | 0x0008 | + | | | right | 0x0000 | 0x0002 | 0x0000 | 0x0004 | 0x0000 | 0x0006 | 0x0000 | 0x0008 | | | +-----------+----------+----------+----------+----------+----------+----------+----------+----------+ | | | both | 0x0001 | 0x0002 | 0x0003 | 0x0004 | 0x0005 | 0x0006 | 0x0007 | 0x0008 | +----------------+-----------+-----------+----------+----------+----------+----------+----------+----------+----------+----------+