Skip to content

Commit 29b24e5

Browse files
committed
[I2S] removes code forcing two slots
1 parent ce60853 commit 29b24e5

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

components/esp_driver_i2s/i2s_tdm.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ static esp_err_t i2s_tdm_set_slot(i2s_chan_handle_t handle, const i2s_tdm_slot_c
104104
handle->active_slot = slot_cfg->slot_mode == I2S_SLOT_MODE_MONO ? 1 : __builtin_popcount(slot_cfg->slot_mask);
105105
uint32_t max_slot_num = 32 - __builtin_clz(slot_cfg->slot_mask);
106106
handle->total_slot = slot_cfg->total_slot < max_slot_num ? max_slot_num : slot_cfg->total_slot;
107-
handle->total_slot = handle->total_slot < 2 ? 2 : handle->total_slot; // At least two slots in a frame
108-
107+
109108
uint32_t buf_size = i2s_get_buf_size(handle, slot_cfg->data_bit_width, handle->dma.frame_num);
110109
/* The DMA buffer need to re-allocate if the buffer size changed */
111110
if (handle->dma.buf_size != buf_size) {

components/hal/i2s_hal.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,7 @@ void i2s_hal_tdm_set_tx_slot(i2s_hal_context_t *hal, bool is_slave, const i2s_ha
318318
uint32_t msk = slot_cfg->tdm.slot_mask;
319319
/* Get the maximum slot number */
320320
cnt = 32 - __builtin_clz(msk);
321-
/* There should be at least 2 slots in total even for mono mode */
322-
cnt = cnt < 2 ? 2 : cnt;
321+
323322
uint32_t total_slot = slot_cfg->tdm.total_slot > cnt ? slot_cfg->tdm.total_slot : cnt;
324323
i2s_ll_tx_reset(hal->dev);
325324
i2s_ll_tx_set_slave_mod(hal->dev, is_slave); //TX Slave

0 commit comments

Comments
 (0)