busy_wait_at_least_cycles(32);

Author: rumbledethumps

src/portable/raspberrypi/rp2040/hcd_rp2040.c

@@ -83,7 +83,6 @@ enum {
   EPX_CTRL_DEFAULT = EP_CTRL_ENABLE_BITS | EP_CTRL_INTERRUPT_PER_BUFFER | offsetof(usb_host_dpram_t, epx_data)
 };
 
-//--------------------------------------------------------------------+
 //--------------------------------------------------------------------+
 //
 //--------------------------------------------------------------------+
@@ -179,10 +178,10 @@ static void __tusb_irq_path_func(sie_start_xfer)(bool send_setup, bool is_rx, bo
   }
 
   // START_TRANS bit on SIE_CTRL has the same behavior as the AVAILABLE bit
-  // described in RP2040 Datasheet, release 2.1, section "4.1.2.5.1. Concurrent access".
+  // described in RP2040 Datasheet, release 2.1, section "4.1.2.5.1. Concurrent access".!
   // We write everything except the START_TRANS bit first, then wait some cycles.
   usb_hw->sie_ctrl = sie_ctrl;
-  busy_wait_us(1);
+  busy_wait_at_least_cycles(32);
   usb_hw->sie_ctrl = sie_ctrl | USB_SIE_CTRL_START_TRANS_BITS;
 }
 
@@ -232,7 +231,7 @@ static void __tusb_irq_path_func(epx_save_context)(hw_endpoint_t *ep) {
 static void __tusb_irq_path_func(epx_switch_ep)(hw_endpoint_t *ep) {
   const bool is_setup = (ep->state == EPSTATE_PENDING_SETUP);
 
-  epx      = ep; // switch pointer
+  epx       = ep; // switch pointer
   ep->state = EPSTATE_ACTIVE;
 
   if (is_setup) {
@@ -350,7 +349,7 @@ static void __tusb_irq_path_func(hcd_rp2040_irq)(void) {
   if (status & USB_INTS_HOST_CONN_DIS_BITS) {
     // Clear speed latch first; after settle the re-read reflects the true current state.
     usb_hw_clear->sie_status = USB_SIE_STATUS_SPEED_BITS;
-    busy_wait_us(1);
+    busy_wait_at_least_cycles(32);
     const uint8_t speed = dev_speed();
     if (speed == SIE_CTRL_SPEED_DISCONNECT) {
       // Stop SIE and silence hardware before emitting remove. Concurrent

src/portable/raspberrypi/rp2040/rp2040_usb.c

@@ -127,7 +127,7 @@ void __tusb_irq_path_func(bufctrl_write32)(io_rw_32 *buf_reg, uint32_t value) {
   // Don't need delay in host mode as host is in charge of when to start the transaction.
   if (value & (USB_BUF_CTRL_AVAIL | (USB_BUF_CTRL_AVAIL << 16))) {
     if (!rp2usb_is_host_mode()) {
-      busy_wait_us(1);
+      busy_wait_at_least_cycles(32);
     }
     *buf_reg = value; // then set AVAILABLE bit last
   }
@@ -143,7 +143,7 @@ void __tusb_irq_path_func(bufctrl_write16)(io_rw_16 *buf_reg16, uint16_t value)
   // Section 4.1.2.7.1 (rp2040) / 12.7.3.7.1 (rp2350) Concurrent access
   if (value & USB_BUF_CTRL_AVAIL) {
     if (!rp2usb_is_host_mode()) {
-      busy_wait_us(1);
+      busy_wait_at_least_cycles(32);
     }
     *buf_reg16 = value; // then set AVAILABLE bit last
   }