Merge branch 'contrib/github_pr_482' into 'master'

fix(iot_usbh_cdc): Close 'extern C' block (GitHub PR)

Closes AEGHB-1008

See merge request ae_group/esp-iot-solution!1244

Author: lijunru-hub

components/usb/iot_usbh_cdc/CHANGELOG.md

@@ -1,5 +1,12 @@
 # ChangeLog
 
+## v1.0.2 - 2025-3-13
+
+### Bug Fixes:
+
+* Close 'extern C' block
+* flush the ringbuffer when usb disconnect
+
 ## v1.0.1 - 2025-2-26
 
 ### Bug Fixes:

components/usb/iot_usbh_cdc/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.0.1"
+version: "1.0.2"
 targets:
   - esp32s2
   - esp32s3
@@ -10,7 +10,7 @@ documentation: https://docs.espressif.com/projects/esp-iot-solution/en/latest/us
 issues: https://github.com/espressif/esp-iot-solution/issues
 dependencies:
   idf: ">=4.4.1"
-  cmake_utilities: "0.*"
+  cmake_utilities: "*"
 examples:
   - path: ../../../examples/usb/host/usb_cdc_basic
 sbom:

components/usb/iot_usbh_cdc/include/iot_usbh_cdc.h

@@ -266,4 +266,5 @@ esp_err_t usbh_cdc_get_state(usbh_cdc_handle_t cdc_handle, usbh_cdc_state_t *sta
 esp_err_t usbh_cdc_desc_print(usbh_cdc_handle_t cdc_handle);
 
 #ifdef __cplusplus
+}
 #endif

components/usb/iot_usbh_cdc/iot_usbh_cdc.c

@@ -664,6 +664,9 @@ static esp_err_t _cdc_close(usbh_cdc_t *cdc)
     usb_host_device_close(p_usbh_cdc_obj->cdc_client_hdl, cdc->dev_hdl);
     cdc->state = USBH_CDC_CLOSE;
 
+    _ring_buffer_flush(cdc->in_ringbuf_handle);
+    _ring_buffer_flush(cdc->out_ringbuf_handle);
+
     if (cdc->cbs.disconnect) {
         cdc->cbs.disconnect((usbh_cdc_handle_t)cdc, cdc->cbs.user_data);
     }

components/usb/iot_usbh_modem/CHANGELOG.md

@@ -1,9 +1,13 @@
 # ChangeLog
 
-## v1.1.1 - 2024-11-28
+## v1.1.2 - 2024-3-14
+
+* Avoid `_usb_data_recv_task` from consuming too much time slice.
+
+## v1.1.1 - 2024-3-11
 
 * Add Kconfig MODEM_PRINT_DEVICE_DESCRIPTOR
- 
+
 ## v1.1.0 - 2024-11-28
 
 * Support ESP32-P4 with EC20_CE cat.4 module

components/usb/iot_usbh_modem/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.1.0"
+version: "1.1.2"
 targets:
   - esp32s2
   - esp32s3

components/usb/iot_usbh_modem/src/esp_modem_usb_dte.c

@@ -234,7 +234,7 @@ static void _usb_data_recv_task(void *param)
             }
         }
         if (!(length || length2)) {
-            ulTaskNotifyTake(true, 1);//yield to other task, but unblock as soon as possible
+            ulTaskNotifyTake(true, pdMS_TO_TICKS(100));//yield to other task, but unblock as soon as possible
         }
     }
     vTaskDelete(NULL);