Merge branch 'espressif:release/v2.x' into release/v2.x

Jason2866 · web-flow · commit 2bc7973f56d8 · 2024-03-07T14:59:03.000+01:00
diff --git a/cores/esp32/HWCDC.cpp b/cores/esp32/HWCDC.cpp
@@ -186,7 +186,6 @@ void HWCDC::begin(unsigned long baud)
         }    
     }
     usb_serial_jtag_ll_disable_intr_mask(USB_SERIAL_JTAG_LL_INTR_MASK);
-    usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_LL_INTR_MASK);
     usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY | USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT | USB_SERIAL_JTAG_INTR_BUS_RESET);
     if(!intr_handle && esp_intr_alloc(ETS_USB_SERIAL_JTAG_INTR_SOURCE, 0, hw_cdc_isr_handler, NULL, &intr_handle) != ESP_OK){
         isr_log_e("HW USB CDC failed to init interrupts");

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,6 @@ void HWCDC::begin(unsigned long baud)`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`	`usb_serial_jtag_ll_disable_intr_mask(USB_SERIAL_JTAG_LL_INTR_MASK);`
`189`		`- usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_LL_INTR_MASK);`
`190`	`189`	`usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY \| USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT \| USB_SERIAL_JTAG_INTR_BUS_RESET);`
`191`	`190`	`if(!intr_handle && esp_intr_alloc(ETS_USB_SERIAL_JTAG_INTR_SOURCE, 0, hw_cdc_isr_handler, NULL, &intr_handle) != ESP_OK){`
`192`	`191`	`isr_log_e("HW USB CDC failed to init interrupts");`