Merge branch 'refactor/usb_dwc_buff_delay_on_p4' into 'master'

roma-jam · roma-jam · commit 79c66cc16ce1 · 2025-05-14T01:08:55.000+08:00
refactor(hcd_dwc): Apply ls_via_fs_hub delay for all targets

See merge request espressif/esp-idf!38946
diff --git a/components/usb/hcd_dwc.c b/components/usb/hcd_dwc.c
@@ -395,13 +395,11 @@ static inline bool _buffer_check_done(pipe_t *pipe)
     if (pipe->ep_char.type != USB_DWC_XFER_TYPE_CTRL) {
         return true;
     }
-#if (CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3)
     // The HW can't handle two transactions with preamble in one frame.
     // TODO: IDF-12986
     if (pipe->ep_char.ls_via_fs_hub) {
         esp_rom_delay_us(1000);
     }
-#endif // CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
     dma_buffer_block_t *buffer_inflight = pipe->buffers[pipe->multi_buffer_control.rd_idx];
     return (buffer_inflight->flags.ctrl.cur_stg == 2);
 }

Original file line number	Diff line number	Diff line change
`@@ -395,13 +395,11 @@ static inline bool _buffer_check_done(pipe_t *pipe)`
`395`	`395`	`if (pipe->ep_char.type != USB_DWC_XFER_TYPE_CTRL) {`
`396`	`396`	`return true;`
`397`	`397`	`}`
`398`		`-#if (CONFIG_IDF_TARGET_ESP32S2 \|\| CONFIG_IDF_TARGET_ESP32S3)`
`399`	`398`	`// The HW can't handle two transactions with preamble in one frame.`
`400`	`399`	`// TODO: IDF-12986`
`401`	`400`	`if (pipe->ep_char.ls_via_fs_hub) {`
`402`	`401`	`esp_rom_delay_us(1000);`
`403`	`402`	`}`
`404`		`-#endif // CONFIG_IDF_TARGET_ESP32S2 \|\| CONFIG_IDF_TARGET_ESP32S3`
`405`	`403`	`dma_buffer_block_t *buffer_inflight = pipe->buffers[pipe->multi_buffer_control.rd_idx];`
`406`	`404`	`return (buffer_inflight->flags.ctrl.cur_stg == 2);`
`407`	`405`	`}`