Merge branch 'fix/iot_usbh_cdc_multiple_tx_xfer' into 'master'

leeebo · leeebo · commit 19aab47494b5 · 2025-06-18T15:25:09.000+08:00
fix(iot_usbh_cdc): incorrectly tx_xfer multiple times

See merge request ae_group/esp-iot-solution!1307
diff --git a/components/usb/iot_usbh_cdc/CHANGELOG.md b/components/usb/iot_usbh_cdc/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v2.0.1 - 2025-06-17
+
+### Bug Fixes:
+
+* Fix the issue of incorrectly initiating `tx_xfer` multiple times.
+
 ## v2.0.0 - 2025-05-20
 
 ### Features:
diff --git a/components/usb/iot_usbh_cdc/idf_component.yml b/components/usb/iot_usbh_cdc/idf_component.yml
@@ -1,4 +1,4 @@
-version: "2.0.0"
+version: "2.0.1"
 targets:
   - esp32s2
   - esp32s3
diff --git a/components/usb/iot_usbh_cdc/iot_usbh_cdc.c b/components/usb/iot_usbh_cdc/iot_usbh_cdc.c
@@ -536,11 +536,13 @@ static void _cdc_tx_xfer_submit(usb_transfer_t *out_xfer)
             size_t actual_num_bytes = 0;
             _ringbuf_pop(cdc->out_ringbuf_handle, out_xfer->data_buffer, data_len, &actual_num_bytes, 0);
             out_xfer->num_bytes = actual_num_bytes;
+            usb_host_transfer_submit(out_xfer);
         } else {
             xSemaphoreGive(cdc->data.out_xfer_free_sem);
         }
+    } else {
+        usb_host_transfer_submit(out_xfer);
     }
-    usb_host_transfer_submit(out_xfer);
 }
 
 static esp_err_t _cdc_transfers_allocate(usbh_cdc_t *cdc, const usb_ep_desc_t *notif_ep_desc, const usb_ep_desc_t *in_ep_desc, const usb_ep_desc_t *out_ep_desc)
diff --git a/components/usb/iot_usbh_modem/test_apps/sdkconfig.defaults b/components/usb/iot_usbh_modem/test_apps/sdkconfig.defaults
@@ -19,3 +19,5 @@ CONFIG_LWIP_PPP_SUPPORT=y
 CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT=y
 CONFIG_LWIP_PPP_PAP_SUPPORT=y
 CONFIG_USB_HOST_CONTROL_TRANSFER_MAX_SIZE=1024
+
+CONFIG_EPPP_LINK_USES_PPP=y

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: "2.0.0"`
	`1`	`+version: "2.0.1"`
`2`	`2`	`targets:`
`3`	`3`	`- esp32s2`
`4`	`4`	`- esp32s3`
Original file line number	Diff line number	Diff line change
`@@ -536,11 +536,13 @@ static void _cdc_tx_xfer_submit(usb_transfer_t *out_xfer)`
`536`	`536`	`size_t actual_num_bytes = 0;`
`537`	`537`	`_ringbuf_pop(cdc->out_ringbuf_handle, out_xfer->data_buffer, data_len, &actual_num_bytes, 0);`
`538`	`538`	`out_xfer->num_bytes = actual_num_bytes;`
	`539`	`+ usb_host_transfer_submit(out_xfer);`
`539`	`540`	`} else {`
`540`	`541`	`xSemaphoreGive(cdc->data.out_xfer_free_sem);`
`541`	`542`	`}`
	`543`	`+ } else {`
	`544`	`+ usb_host_transfer_submit(out_xfer);`
`542`	`545`	`}`
`543`		`- usb_host_transfer_submit(out_xfer);`
`544`	`546`	`}`
`545`	`547`
`546`	`548`	`static esp_err_t _cdc_transfers_allocate(usbh_cdc_t cdc, const usb_ep_desc_t notif_ep_desc, const usb_ep_desc_t in_ep_desc, const usb_ep_desc_t out_ep_desc)`