Merge branch 'bugfix/fix_periph_i2s_deinit_channel_delete' into 'main'

fix(esp_board_manager): Fix periph i2s deinit channel delete

See merge request adf/multimedia/esp-gmf!232

Author: jason-mao

packages/esp_board_manager/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.4.5
+
+### Bug Fixes
+
+- Fix `periph_i2s_deinit` channel delete
+- Fix i2s config `total_slot` for esp32_s3_korvo2_v3
+
 ## 0.4.4
 
 ### Bug Fixes

packages/esp_board_manager/boards/esp32_s3_korvo2_v3/board_peripherals.yaml

@@ -29,7 +29,7 @@ peripherals:
       slot_mode: I2S_SLOT_MODE_MONO     # I2S_SLOT_MODE_MONO or I2S_SLOT_MODE_STEREO
       slot_mask: I2S_TDM_SLOT0          # I2S_TDM_SLOT0, I2S_TDM_SLOT1 slots
       ws_width: 16                      # WS signal width in BCLK ticks
-      total_slot: 4
+      total_slot: 2
 
       # GPIO configuration
       pins:

packages/esp_board_manager/idf_component.yml

@@ -1,4 +1,4 @@
-version: 0.4.4
+version: 0.4.5
 description: Board manager for ESP-GMF
 url: https://github.com/espressif/esp-gmf/tree/main/packages/esp_board_manager
 documentation: https://github.com/espressif/esp-gmf/blob/main/packages/esp_board_manager/README.md

packages/esp_board_manager/peripherals/periph_i2s.c

@@ -151,26 +151,30 @@ int periph_i2s_deinit(void *periph_handle)
     i2s_chan_handle_t handle = (i2s_chan_handle_t)periph_handle;
     for (size_t i = 0; i < SOC_I2S_NUM; i++) {
         if (i2s_chan_handles[i].chan_out == handle) {
+            i2s_channel_disable(i2s_chan_handles[i].chan_out);
             i2s_del_channel(i2s_chan_handles[i].chan_out);
             i2s_chan_handles[i].chan_out = NULL;
             i2s_chan_handles[i].out_en = false;
-            ESP_LOGW(TAG, "Caution: Releasing TX (%p), RX (%p) forced to stop.",
-                     i2s_chan_handles[i].chan_out, i2s_chan_handles[i].chan_in);
-            i2s_channel_disable(i2s_chan_handles[i].chan_in);
-            i2s_del_channel(i2s_chan_handles[i].chan_in);
-            i2s_chan_handles[i].chan_in = NULL;
-            i2s_chan_handles[i].in_en = false;
+            ESP_LOGW(TAG, "Caution: Releasing TX (%p).", i2s_chan_handles[i].chan_out);
+            if (i2s_chan_handles[i].chan_in != NULL && i2s_chan_handles[i].in_en == false) {
+                ESP_LOGW(TAG, "Caution: RX (%p) forced to stop.", i2s_chan_handles[i].chan_in);
+                i2s_channel_disable(i2s_chan_handles[i].chan_in);
+                i2s_del_channel(i2s_chan_handles[i].chan_in);
+                i2s_chan_handles[i].chan_in = NULL;
+            }
         }
         if (i2s_chan_handles[i].chan_in == handle) {
+            i2s_channel_disable(i2s_chan_handles[i].chan_in);
             i2s_del_channel(i2s_chan_handles[i].chan_in);
             i2s_chan_handles[i].chan_in = NULL;
             i2s_chan_handles[i].in_en = false;
-            ESP_LOGW(TAG, "Caution: Releasing RX (%p), TX (%p) forced to stop.",
-                     i2s_chan_handles[i].chan_in, i2s_chan_handles[i].chan_out);
-            i2s_channel_disable(i2s_chan_handles[i].chan_out);
-            i2s_del_channel(i2s_chan_handles[i].chan_out);
-            i2s_chan_handles[i].chan_out = NULL;
-            i2s_chan_handles[i].out_en = false;
+            ESP_LOGW(TAG, "Caution: Releasing RX (%p).", i2s_chan_handles[i].chan_in);
+            if (i2s_chan_handles[i].chan_out != NULL && i2s_chan_handles[i].out_en == false) {
+                ESP_LOGW(TAG, "Caution: TX (%p) forced to stop.", i2s_chan_handles[i].chan_out);
+                i2s_channel_disable(i2s_chan_handles[i].chan_out);
+                i2s_del_channel(i2s_chan_handles[i].chan_out);
+                i2s_chan_handles[i].chan_out = NULL;
+            }
         }
     }
     return 0;