Merge branch 'bugfix/i2s_tx_auto_clear_not_totally_clean_the_buf' int…

…o 'master' i2s: fix tx incomplete auto clear Closes IDFGH-8416 See merge request espressif/esp-idf!20536
espressif · Oct 12, 2022 · 9408e13 · 9408e13
2 parents b847138 + be7c656
commit 9408e13
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/components/driver/deprecated/i2s_legacy.c b/components/driver/deprecated/i2s_legacy.c
@@ -200,16 +200,16 @@ static bool IRAM_ATTR i2s_dma_tx_callback(gdma_channel_handle_t dma_chan, gdma_e
         if (xQueueIsQueueFullFromISR(p_i2s->tx->queue)) {
             xQueueReceiveFromISR(p_i2s->tx->queue, &dummy, &tmp);
             need_awoke |= tmp;
-            if (p_i2s->tx_desc_auto_clear) {
-                memset((void *) dummy, 0, p_i2s->tx->buf_size);
-            }
             if (p_i2s->i2s_queue) {
                 i2s_event.type = I2S_EVENT_TX_Q_OVF;
                 i2s_event.size = p_i2s->tx->buf_size;
                 xQueueSendFromISR(p_i2s->i2s_queue, (void * )&i2s_event, &tmp);
                 need_awoke |= tmp;
             }
         }
+        if (p_i2s->tx_desc_auto_clear) {
+            memset((void *) (((lldesc_t *)finish_desc)->buf), 0, p_i2s->tx->buf_size);
+        }
         xQueueSendFromISR(p_i2s->tx->queue, &(((lldesc_t *)finish_desc)->buf), &tmp);
         need_awoke |= tmp;
         if (p_i2s->i2s_queue) {
@@ -256,18 +256,18 @@ static void IRAM_ATTR i2s_intr_handler_default(void *arg)
         if (xQueueIsQueueFullFromISR(p_i2s->tx->queue)) {
             xQueueReceiveFromISR(p_i2s->tx->queue, &dummy, &tmp);
             need_awoke |= tmp;
-            // See if tx descriptor needs to be auto cleared:
-            // This will avoid any kind of noise that may get introduced due to transmission
-            // of previous data from tx descriptor on I2S line.
-            if (p_i2s->tx_desc_auto_clear == true) {
-                memset((void *) dummy, 0, p_i2s->tx->buf_size);
-            }
             if (p_i2s->i2s_queue) {
                 i2s_event.type = I2S_EVENT_TX_Q_OVF;
                 xQueueSendFromISR(p_i2s->i2s_queue, (void * )&i2s_event, &tmp);
                 need_awoke |= tmp;
             }
         }
+        // See if tx descriptor needs to be auto cleared:
+        // This will avoid any kind of noise that may get introduced due to transmission
+        // of previous data from tx descriptor on I2S line.
+        if (p_i2s->tx_desc_auto_clear == true) {
+            memset((void *)(((lldesc_t *)finish_desc)->buf), 0, p_i2s->tx->buf_size);
+        }
         xQueueSendFromISR(p_i2s->tx->queue, &(((lldesc_t *)finish_desc)->buf), &tmp);
         need_awoke |= tmp;
         if (p_i2s->i2s_queue) {

diff --git a/components/driver/i2s/i2s_common.c b/components/driver/i2s/i2s_common.c
@@ -547,12 +547,11 @@ static bool IRAM_ATTR i2s_dma_tx_callback(gdma_channel_handle_t dma_chan, gdma_e
             user_need_yield |= handle->callbacks.on_send_q_ovf(handle, &evt, handle->user_data);
         }
     }
-    xQueueSendFromISR(handle->msg_queue, &(finish_desc->buf), &need_yield2);
-
     if (handle->dma.auto_clear) {
         uint8_t *sent_buf = (uint8_t *)finish_desc->buf;
         memset(sent_buf, 0, handle->dma.buf_size);
     }
+    xQueueSendFromISR(handle->msg_queue, &(finish_desc->buf), &need_yield2);
 
     return need_yield1 | need_yield2 | user_need_yield;
 }
@@ -627,12 +626,12 @@ static void IRAM_ATTR i2s_dma_tx_callback(void *arg)
                 user_need_yield |= handle->callbacks.on_send_q_ovf(handle, &evt, handle->user_data);
             }
         }
-        xQueueSendFromISR(handle->msg_queue, &(finish_desc->buf), &need_yield2);
         // Auto clear the dma buffer after data sent
         if (handle->dma.auto_clear) {
             uint8_t *buff = (uint8_t *)finish_desc->buf;
             memset(buff, 0, handle->dma.buf_size);
         }
+        xQueueSendFromISR(handle->msg_queue, &(finish_desc->buf), &need_yield2);
     }
 
     if (need_yield1 || need_yield2 || user_need_yield) {