espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 11:17:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove(i2s): remove deprecated configuration in IDF v6.0

Browse Source
This commit is contained in:
laokaiyao
2025-06-12 16:46:51 +08:00
parent bf3a050f4d
commit a4cb2dc98b
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/esp_driver_i2s/i2s_common.c
View File

@ -573,10 +573,6 @@ uint32_t i2s_get_source_clk_freq(i2s_clock_src_t clk_src, uint32_t mclk_freq_hz)
return clk_freq; return clk_freq;
} }
/* Temporary ignore the deprecated warning of i2s_event_data_t::data */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#if SOC_GDMA_SUPPORTED #if SOC_GDMA_SUPPORTED
static bool IRAM_ATTR i2s_dma_rx_callback(gdma_channel_handle_t dma_chan, gdma_event_data_t *event_data, void *user_data) static bool IRAM_ATTR i2s_dma_rx_callback(gdma_channel_handle_t dma_chan, gdma_event_data_t *event_data, void *user_data)
{ {
@ -592,7 +588,6 @@ static bool IRAM_ATTR i2s_dma_rx_callback(gdma_channel_handle_t dma_chan, gdma_e
esp_cache_msync((void *)finish_desc->buf, handle->dma.buf_size, ESP_CACHE_MSYNC_FLAG_INVALIDATE); esp_cache_msync((void *)finish_desc->buf, handle->dma.buf_size, ESP_CACHE_MSYNC_FLAG_INVALIDATE);
#endif #endif
i2s_event_data_t evt = { i2s_event_data_t evt = {
.data = &(finish_desc->buf),
.dma_buf = (void *)finish_desc->buf, .dma_buf = (void *)finish_desc->buf,
.size = handle->dma.buf_size, .size = handle->dma.buf_size,
}; };
@ -602,7 +597,6 @@ static bool IRAM_ATTR i2s_dma_rx_callback(gdma_channel_handle_t dma_chan, gdma_e
if (xQueueIsQueueFullFromISR(handle->msg_queue)) { if (xQueueIsQueueFullFromISR(handle->msg_queue)) {
xQueueReceiveFromISR(handle->msg_queue, &dummy, &need_yield1); xQueueReceiveFromISR(handle->msg_queue, &dummy, &need_yield1);
if (handle->callbacks.on_recv_q_ovf) { if (handle->callbacks.on_recv_q_ovf) {
evt.data = NULL;
user_need_yield |= handle->callbacks.on_recv_q_ovf(handle, &evt, handle->user_data); user_need_yield |= handle->callbacks.on_recv_q_ovf(handle, &evt, handle->user_data);
} }
} }
@ -623,7 +617,6 @@ static bool IRAM_ATTR i2s_dma_tx_callback(gdma_channel_handle_t dma_chan, gdma_e
finish_desc = (lldesc_t *)event_data->tx_eof_desc_addr; finish_desc = (lldesc_t *)event_data->tx_eof_desc_addr;
void *curr_buf = (void *)finish_desc->buf; void *curr_buf = (void *)finish_desc->buf;
i2s_event_data_t evt = { i2s_event_data_t evt = {
.data = &(finish_desc->buf),
.dma_buf = curr_buf, .dma_buf = curr_buf,
.size = handle->dma.buf_size, .size = handle->dma.buf_size,
}; };
@ -642,7 +635,6 @@ static bool IRAM_ATTR i2s_dma_tx_callback(gdma_channel_handle_t dma_chan, gdma_e
if (xQueueIsQueueFullFromISR(handle->msg_queue)) { if (xQueueIsQueueFullFromISR(handle->msg_queue)) {
xQueueReceiveFromISR(handle->msg_queue, &dummy, &need_yield1); xQueueReceiveFromISR(handle->msg_queue, &dummy, &need_yield1);
if (handle->callbacks.on_send_q_ovf) { if (handle->callbacks.on_send_q_ovf) {
evt.data = NULL;
evt.dma_buf = NULL; evt.dma_buf = NULL;
user_need_yield |= handle->callbacks.on_send_q_ovf(handle, &evt, handle->user_data); user_need_yield |= handle->callbacks.on_send_q_ovf(handle, &evt, handle->user_data);
} }
@ -678,7 +670,6 @@ static void IRAM_ATTR i2s_dma_rx_callback(void *arg)
if (handle && (status & I2S_LL_EVENT_RX_EOF)) { if (handle && (status & I2S_LL_EVENT_RX_EOF)) {
i2s_hal_get_in_eof_des_addr(&(handle->controller->hal), (uint32_t *)&finish_desc); i2s_hal_get_in_eof_des_addr(&(handle->controller->hal), (uint32_t *)&finish_desc);
evt.data = &(finish_desc->buf);
evt.dma_buf = (void *)finish_desc->buf; evt.dma_buf = (void *)finish_desc->buf;
evt.size = handle->dma.buf_size; evt.size = handle->dma.buf_size;
if (handle->callbacks.on_recv) { if (handle->callbacks.on_recv) {
@ -687,7 +678,6 @@ static void IRAM_ATTR i2s_dma_rx_callback(void *arg)
if (xQueueIsQueueFullFromISR(handle->msg_queue)) { if (xQueueIsQueueFullFromISR(handle->msg_queue)) {
xQueueReceiveFromISR(handle->msg_queue, &dummy, &need_yield1); xQueueReceiveFromISR(handle->msg_queue, &dummy, &need_yield1);
if (handle->callbacks.on_recv_q_ovf) { if (handle->callbacks.on_recv_q_ovf) {
evt.data = NULL;
evt.dma_buf = NULL; evt.dma_buf = NULL;
user_need_yield |= handle->callbacks.on_recv_q_ovf(handle, &evt, handle->user_data); user_need_yield |= handle->callbacks.on_recv_q_ovf(handle, &evt, handle->user_data);
} }
@ -719,7 +709,6 @@ static void IRAM_ATTR i2s_dma_tx_callback(void *arg)
if (handle && (status & I2S_LL_EVENT_TX_EOF)) { if (handle && (status & I2S_LL_EVENT_TX_EOF)) {
i2s_hal_get_out_eof_des_addr(&(handle->controller->hal), (uint32_t *)&finish_desc); i2s_hal_get_out_eof_des_addr(&(handle->controller->hal), (uint32_t *)&finish_desc);
void *curr_buf = (void *)finish_desc->buf; void *curr_buf = (void *)finish_desc->buf;
evt.data = &(finish_desc->buf);
evt.dma_buf = curr_buf; evt.dma_buf = curr_buf;
evt.size = handle->dma.buf_size; evt.size = handle->dma.buf_size;
// Auto clear the dma buffer before data sent // Auto clear the dma buffer before data sent
@ -732,7 +721,6 @@ static void IRAM_ATTR i2s_dma_tx_callback(void *arg)
if (xQueueIsQueueFullFromISR(handle->msg_queue)) { if (xQueueIsQueueFullFromISR(handle->msg_queue)) {
xQueueReceiveFromISR(handle->msg_queue, &dummy, &need_yield1); xQueueReceiveFromISR(handle->msg_queue, &dummy, &need_yield1);
if (handle->callbacks.on_send_q_ovf) { if (handle->callbacks.on_send_q_ovf) {
evt.data = NULL;
user_need_yield |= handle->callbacks.on_send_q_ovf(handle, &evt, handle->user_data); user_need_yield |= handle->callbacks.on_send_q_ovf(handle, &evt, handle->user_data);
} }
} }
@ -749,8 +737,6 @@ static void IRAM_ATTR i2s_dma_tx_callback(void *arg)
} }
#endif #endif
#pragma GCC diagnostic pop
#if SOC_GDMA_SUPPORTED #if SOC_GDMA_SUPPORTED
/** /**
* @brief I2S DMA interrupt initialization (implemented by I2S dedicated DMA) * @brief I2S DMA interrupt initialization (implemented by I2S dedicated DMA)

3
components/esp_driver_i2s/include/driver/i2s_types.h
View File

@ -75,9 +75,6 @@ typedef struct {
* @brief Event structure used in I2S event queue * @brief Event structure used in I2S event queue
*/ */
typedef struct { typedef struct {
void *data __attribute__((deprecated)); /**< (Deprecated) The secondary pointer of DMA buffer that just finished sending or receiving for `on_recv` and `on_sent` callback
* NULL for `on_recv_q_ovf` and `on_send_q_ovf` callback
*/
void *dma_buf;/**< The first level pointer of DMA buffer that just finished sending or receiving for `on_recv` and `on_sent` callback void *dma_buf;/**< The first level pointer of DMA buffer that just finished sending or receiving for `on_recv` and `on_sent` callback
* NULL for `on_recv_q_ovf` and `on_send_q_ovf` callback * NULL for `on_recv_q_ovf` and `on_send_q_ovf` callback
*/ */