rp2 hcd rework: epx for non-interrupt and ping-pong double buffered

src/portable/raspberrypi/rp2040/dcd_rp2040.c

@@ -69,11 +69,27 @@ TU_ATTR_ALWAYS_INLINE static inline hw_endpoint_t *hw_endpoint_get_by_addr(uint8
   return hw_endpoint_get(num, dir);
 }
 
+TU_ATTR_ALWAYS_INLINE static inline io_rw_32 *hwep_ctrl_reg_device(struct hw_endpoint *ep) {
+  const uint8_t epnum = tu_edpt_number(ep->ep_addr);
+  const uint8_t dir   = (uint8_t)tu_edpt_dir(ep->ep_addr);
+  if (epnum == 0) {
+    // EP0 has no endpoint control register because the buffer offsets are fixed and always enabled
+    return NULL;
+  }
+  return (dir == TUSB_DIR_IN) ? &usb_dpram->ep_ctrl[epnum - 1].in : &usb_dpram->ep_ctrl[epnum - 1].out;
+}
+
+TU_ATTR_ALWAYS_INLINE static inline io_rw_32 *hwbuf_ctrl_reg_device(struct hw_endpoint *ep) {
+  const uint8_t epnum = tu_edpt_number(ep->ep_addr);
+  const uint8_t dir   = (uint8_t)tu_edpt_dir(ep->ep_addr);
+  return (dir == TUSB_DIR_IN) ? &usb_dpram->ep_buf_ctrl[epnum].in : &usb_dpram->ep_buf_ctrl[epnum].out;
+}
+
 // main processing for dcd_edpt_iso_activate
 static void hw_endpoint_init(hw_endpoint_t *ep, uint8_t ep_addr, uint16_t wMaxPacketSize, uint8_t transfer_type) {
   ep->ep_addr        = ep_addr;
   ep->next_pid       = 0u;
-  ep->wMaxPacketSize = wMaxPacketSize;
+  ep->max_packet_size = wMaxPacketSize;
 
   // Clear existing buffer control state
   io_rw_32 *buf_ctrl_reg = hwbuf_ctrl_reg_device(ep);
@@ -83,7 +99,7 @@ static void hw_endpoint_init(hw_endpoint_t *ep, uint8_t ep_addr, uint16_t wMaxPa
   const uint8_t epnum = tu_edpt_number(ep_addr);
   if (epnum == 0) {
     // Buffer offset is fixed (also double buffered)
-    ep->hw_data_buf = (uint8_t*) &usb_dpram->ep0_buf_a[0];
+    ep->dpram_buf = (uint8_t *)&usb_dpram->ep0_buf_a[0];
   } else {
     // round up size to multiple of 64
     uint16_t size = (uint16_t)tu_round_up(wMaxPacketSize, 64);
@@ -100,11 +116,11 @@ static void hw_endpoint_init(hw_endpoint_t *ep, uint8_t ep_addr, uint16_t wMaxPa
     }
 
     // assign buffer
-    ep->hw_data_buf = hw_buffer_ptr;
+    ep->dpram_buf = hw_buffer_ptr;
     hw_buffer_ptr += size;
 
     hard_assert(hw_buffer_ptr < usb_dpram->epx_data + sizeof(usb_dpram->epx_data));
-    pico_info("  Allocated %d bytes (0x%p)\r\n", size, ep->hw_data_buf);
+    pico_info("  Allocated %d bytes (0x%p)\r\n", size, ep->dpram_buf);
   }
 }
 
@@ -113,7 +129,7 @@ static void hw_endpoint_enable(hw_endpoint_t *ep, uint8_t transfer_type) {
   // Set endpoint control register to enable (EP0 has no endpoint control register)
   if (ctrl_reg != NULL) {
     const uint32_t ctrl_value =
-      EP_CTRL_ENABLE_BITS | ((uint32_t)transfer_type << EP_CTRL_BUFFER_TYPE_LSB) | hw_data_offset(ep->hw_data_buf);
+      EP_CTRL_ENABLE_BITS | ((uint32_t)transfer_type << EP_CTRL_BUFFER_TYPE_LSB) | hw_data_offset(ep->dpram_buf);
     *ctrl_reg = ctrl_value;
   }
 }
@@ -170,7 +186,10 @@ static void __tusb_irq_path_func(handle_hw_buff_status)(void) {
       const tusb_dir_t dir   = (i & 1u) ? TUSB_DIR_OUT : TUSB_DIR_IN;
       hw_endpoint_t   *ep    = hw_endpoint_get(epnum, dir);
 
-      const bool done = hw_endpoint_xfer_continue(ep);
+      io_rw_32  *ep_reg  = hwep_ctrl_reg_device(ep);
+      io_rw_32  *buf_reg = hwbuf_ctrl_reg_device(ep);
+      const bool done    = hw_endpoint_xfer_continue(ep, ep_reg, buf_reg);
+
       if (done) {
         // Notify usbd
         const uint16_t xferred_len = ep->xferred_len;
@@ -232,7 +251,9 @@ static void __tusb_irq_path_func(dcd_rp2040_irq)(void) {
         hw_endpoint_lock_update(ep, 1);
         if (ep->pending) {
           ep->pending = 0;
-          hw_endpoint_start_next_buffer(ep);
+          io_rw_32 *ep_reg  = hwep_ctrl_reg_device(ep);
+          io_rw_32 *buf_reg = hwbuf_ctrl_reg_device(ep);
+          hw_endpoint_start_next_buffer(ep, ep_reg, buf_reg);
         }
         hw_endpoint_lock_update(ep, -1);
       }
@@ -480,12 +501,12 @@ bool dcd_edpt_iso_activate(uint8_t rhport, const tusb_desc_endpoint_t *ep_desc)
   const uint8_t       epnum = tu_edpt_number(ep_desc->bEndpointAddress);
   const tusb_dir_t    dir   = tu_edpt_dir(ep_desc->bEndpointAddress);
   struct hw_endpoint *ep    = hw_endpoint_get(epnum, dir);
-  TU_ASSERT(ep->hw_data_buf != NULL); // must be inited and allocated previously
+  TU_ASSERT(ep->dpram_buf != NULL); // must be inited and allocated previously
 
   if (ep->active) {
     hw_endpoint_abort_xfer(ep); // abort any pending transfer
   }
-  ep->wMaxPacketSize = ep_desc->wMaxPacketSize;
+  ep->max_packet_size = ep_desc->wMaxPacketSize;
 
   hw_endpoint_enable(ep, TUSB_XFER_ISOCHRONOUS);
   return true;
@@ -501,7 +522,9 @@ bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t *buffer, uint16_t to
   (void)rhport;
   (void)is_isr;
   hw_endpoint_t *ep = hw_endpoint_get_by_addr(ep_addr);
-  hw_endpoint_xfer_start(ep, buffer, NULL, total_bytes);
+  io_rw_32      *ep_reg  = hwep_ctrl_reg_device(ep);
+  io_rw_32      *buf_reg = hwbuf_ctrl_reg_device(ep);
+  hw_endpoint_xfer_start(ep, ep_reg, buf_reg, buffer, NULL, total_bytes);
   return true;
 }
 
@@ -510,7 +533,9 @@ bool dcd_edpt_xfer_fifo(uint8_t rhport, uint8_t ep_addr, tu_fifo_t *ff, uint16_t
   (void)rhport;
   (void)is_isr;
   hw_endpoint_t *ep = hw_endpoint_get_by_addr(ep_addr);
-  hw_endpoint_xfer_start(ep, NULL, ff, total_bytes);
+  io_rw_32      *ep_reg  = hwep_ctrl_reg_device(ep);
+  io_rw_32      *buf_reg = hwbuf_ctrl_reg_device(ep);
+  hw_endpoint_xfer_start(ep, ep_reg, buf_reg, NULL, ff, total_bytes);
   return true;
 }
 #endif