catch up with pio lib

examples/device/hid_boot_interface/src/tusb_config.h

@@ -41,6 +41,9 @@
 
 // Use raspberry pio-usb for device
 #define CFG_TUD_RPI_PIO_USB            1
+#if CFG_TUD_RPI_PIO_USB
+#define BOARD_DEVICE_RHPORT_NUM 1
+#endif
 
 // RHPort number used for device can be defined by board.mk, default to port 0
 #ifndef BOARD_DEVICE_RHPORT_NUM

hw/bsp/rp2040/family.cmake

@@ -31,6 +31,7 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
 			${TOP}/src/common/tusb_fifo.c
 			${TOP}/lib/Pico-PIO-USB/pio_usb.c
 			${TOP}/lib/Pico-PIO-USB/pio_usb_host.c
+			${TOP}/lib/Pico-PIO-USB/pio_usb_device.c
 			${TOP}/lib/Pico-PIO-USB/pio_usb_hw.c
 			${TOP}/lib/Pico-PIO-USB/usb_crc.c
 			)
@@ -69,8 +70,8 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
 	add_library(tinyusb_device_base INTERFACE)
 	target_sources(tinyusb_device_base INTERFACE
 			${TOP}/src/portable/raspberrypi/rp2040/dcd_rp2040.c
-		  ${TOP}/src/portable/raspberrypi/pio_usb/dcd_pio_usb.c
 			${TOP}/src/portable/raspberrypi/rp2040/rp2040_usb.c
+		  ${TOP}/src/portable/raspberrypi/pio_usb/dcd_pio_usb.c
 			${TOP}/src/device/usbd.c
 			${TOP}/src/device/usbd_control.c
 			${TOP}/src/class/audio/audio_device.c
@@ -92,13 +93,13 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
 	target_sources(tinyusb_host_base INTERFACE
 			${TOP}/src/portable/raspberrypi/rp2040/hcd_rp2040.c
 			${TOP}/src/portable/raspberrypi/rp2040/rp2040_usb.c
+		  ${TOP}/src/portable/raspberrypi/pio_usb/hcd_pio_usb.c
 			${TOP}/src/host/usbh.c
 			${TOP}/src/host/hub.c
 			${TOP}/src/class/cdc/cdc_host.c
 			${TOP}/src/class/hid/hid_host.c
 			${TOP}/src/class/msc/msc_host.c
 			${TOP}/src/class/vendor/vendor_host.c
-		  ${TOP}/src/portable/raspberrypi/pio_usb/hcd_pio_usb.c
 			)
 
 	# Sometimes have to do host specific actions in mostly common functions

lib/Pico-PIO-USB

@@ -1 +1 @@
-Subproject commit 4993f4a1df03c8af13c8091052a6274e8c333bc0
+Subproject commit 84a00b976041d8c34cf660fda6fa88198c9721dc

src/portable/raspberrypi/pio_usb/dcd_pio_usb.c

@@ -0,0 +1,234 @@
+/* 
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018, hathach (tinyusb.org)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This file is part of the TinyUSB stack.
+ */
+
+#include "tusb_option.h"
+
+#if CFG_TUD_ENABLED && (CFG_TUSB_MCU == OPT_MCU_RP2040) && CFG_TUD_RPI_PIO_USB
+
+#include "pico.h"
+#include "hardware/pio.h"
+#include "pio_usb.h"
+
+#include "device/dcd.h"
+
+//--------------------------------------------------------------------+
+// MACRO TYPEDEF CONSTANT ENUM DECLARATION
+//--------------------------------------------------------------------+
+
+#define RHPORT_OFFSET     1
+#define RHPORT_PIO(_x)    ((_x)-RHPORT_OFFSET)
+
+static uint8_t new_addr = 0;
+
+//-------------  -------------//
+static usb_device_t *usb_device = NULL;
+static usb_descriptor_buffers_t desc;
+
+/*------------------------------------------------------------------*/
+/* Device API
+ *------------------------------------------------------------------*/
+
+// Initialize controller to device mode
+void dcd_init (uint8_t rhport)
+{
+  (void) rhport;
+
+  static pio_usb_configuration_t config = PIO_USB_DEFAULT_CONFIG;
+  usb_device = pio_usb_device_init(&config, &desc);
+}
+
+// Enable device interrupt
+void dcd_int_enable (uint8_t rhport)
+{
+  (void) rhport;
+}
+
+// Disable device interrupt
+void dcd_int_disable (uint8_t rhport)
+{
+  (void) rhport;
+}
+
+// Receive Set Address request, mcu port must also include status IN response
+void dcd_set_address (uint8_t rhport, uint8_t dev_addr)
+{
+  // store addr, will update crc5 lut when status is complete
+  new_addr = dev_addr;
+
+  dcd_edpt_xfer(rhport, 0x80, NULL, 0);
+}
+
+// Wake up host
+void dcd_remote_wakeup (uint8_t rhport)
+{
+  (void) rhport;
+}
+
+// Connect by enabling internal pull-up resistor on D+/D-
+void dcd_connect(uint8_t rhport)
+{
+  (void) rhport;
+}
+
+// Disconnect by disabling internal pull-up resistor on D+/D-
+void dcd_disconnect(uint8_t rhport)
+{
+  (void) rhport;
+}
+
+//--------------------------------------------------------------------+
+// Endpoint API
+//--------------------------------------------------------------------+
+
+// Configure endpoint's registers according to descriptor
+bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * ep_desc)
+{
+  (void) rhport;
+  (void) ep_desc;
+  return false;
+}
+
+void dcd_edpt_close_all (uint8_t rhport)
+{
+  (void) rhport;
+}
+
+// Submit a transfer, When complete dcd_event_xfer_complete() is invoked to notify the stack
+bool dcd_edpt_xfer (uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes)
+{
+  uint8_t pio_rhport = RHPORT_PIO(rhport);
+  return pio_usb_device_endpoint_transfer(pio_rhport, ep_addr, buffer, total_bytes);
+}
+
+// Submit a transfer where is managed by FIFO, When complete dcd_event_xfer_complete() is invoked to notify the stack - optional, however, must be listed in usbd.c
+bool dcd_edpt_xfer_fifo (uint8_t rhport, uint8_t ep_addr, tu_fifo_t * ff, uint16_t total_bytes)
+{
+  (void) rhport;
+  (void) ep_addr;
+  (void) ff;
+  (void) total_bytes;
+  return false;
+}
+
+// Stall endpoint
+void dcd_edpt_stall (uint8_t rhport, uint8_t ep_addr)
+{
+  (void) rhport;
+  (void) ep_addr;
+}
+
+// clear stall, data toggle is also reset to DATA0
+void dcd_edpt_clear_stall (uint8_t rhport, uint8_t ep_addr)
+{
+  (void) rhport;
+  (void) ep_addr;
+}
+
+//--------------------------------------------------------------------+
+//
+//--------------------------------------------------------------------+
+extern void update_ep0_crc5_lut(uint8_t addr);
+
+static void __no_inline_not_in_flash_func(handle_endpoint_irq)(pio_hw_root_port_t* port, uint32_t flag)
+{
+  volatile uint32_t* ep_reg;
+  xfer_result_t result;
+
+  if ( flag == PIO_USB_INTS_ENDPOINT_COMPLETE_BITS )
+  {
+    ep_reg = &port->ep_complete;
+    result = XFER_RESULT_SUCCESS;
+  }
+  else if ( flag == PIO_USB_INTS_ENDPOINT_ERROR_BITS )
+  {
+    ep_reg = &port->ep_error;
+    result = XFER_RESULT_FAILED;
+  }
+  else if ( flag == PIO_USB_INTS_ENDPOINT_STALLED_BITS )
+  {
+    ep_reg = &port->ep_stalled;
+    result = XFER_RESULT_STALLED;
+  }
+  else
+  {
+    // something wrong
+    return;
+  }
+
+  const uint32_t ep_all = *ep_reg;
+
+  for(uint8_t ep_idx = 0; ep_idx < PIO_USB_EP_POOL_CNT; ep_idx++)
+  {
+    uint32_t const mask = (1u << ep_idx);
+
+    if (ep_all & mask)
+    {
+      pio_hw_endpoint_t* ep = PIO_USB_HW_EP(ep_idx);
+      uint8_t const tu_rhport = port - PIO_USB_HW_RPORT(0) + 1;
+
+      // address is changed, update crc5 lut
+      if (new_addr && ep->ep_num == 0x80 && ep->actual_len == 0)
+      {
+        update_ep0_crc5_lut(new_addr);
+        new_addr = 0;
+      }
+
+      dcd_event_xfer_complete(tu_rhport, ep->ep_num, ep->actual_len, result, true);
+    }
+  }
+
+  // clear all
+  (*ep_reg) &= ~ep_all;
+}
+
+// IRQ Handler
+void __no_inline_not_in_flash_func(pio_usb_device_irq_handler)(uint8_t root_id)
+{
+  uint8_t const tu_rhport = root_id + 1;
+  pio_hw_root_port_t* port = PIO_USB_HW_RPORT(root_id);
+  uint32_t const ints = port->ints;
+
+  if (ints & PIO_USB_INTS_RESET_END_BITS)
+  {
+    new_addr = 0;
+    dcd_event_bus_reset(tu_rhport, TUSB_SPEED_FULL, true);
+  }
+
+  if (ints & PIO_USB_INTS_SETUP_REQ_BITS)
+  {
+    dcd_event_setup_received(tu_rhport, port->setup_packet, true);
+  }
+
+  if ( ints & PIO_USB_INTS_ENDPOINT_COMPLETE_BITS )
+  {
+    handle_endpoint_irq(port, PIO_USB_INTS_ENDPOINT_COMPLETE_BITS);
+  }
+
+  // clear all
+  port->ints &= ~ints;
+}
+
+#endif

src/portable/raspberrypi/pio_usb/hcd_pio_usb.c

@@ -116,19 +116,19 @@ bool hcd_edpt_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_endpoint_t const
   bool const need_pre = (dev_tree.hub_addr && dev_tree.speed == TUSB_SPEED_LOW);
 
   rhport = RHPORT_PIO(rhport);
-  return pio_usb_endpoint_open(rhport, dev_addr, (uint8_t const*) desc_ep, need_pre);
+  return pio_usb_host_endpoint_open(rhport, dev_addr, (uint8_t const*) desc_ep, need_pre);
 }
 
 bool hcd_edpt_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr, uint8_t * buffer, uint16_t buflen)
 {
   rhport = RHPORT_PIO(rhport);
-  return pio_usb_endpoint_transfer(rhport, dev_addr, ep_addr, buffer, buflen);
+  return pio_usb_host_endpoint_transfer(rhport, dev_addr, ep_addr, buffer, buflen);
 }
 
 bool hcd_setup_send(uint8_t rhport, uint8_t dev_addr, uint8_t const setup_packet[8])
 {
   rhport = RHPORT_PIO(rhport);
-  return pio_usb_endpoint_send_setup(rhport, dev_addr, setup_packet);
+  return pio_usb_host_send_setup(rhport, dev_addr, setup_packet);
 }
 
 //bool hcd_edpt_busy(uint8_t dev_addr, uint8_t ep_addr)
@@ -153,7 +153,7 @@ bool hcd_edpt_clear_stall(uint8_t dev_addr, uint8_t ep_addr)
   return true;
 }
 
-void __no_inline_not_in_flash_func(handle_endpoint_irq)(pio_hw_root_port_t* port, uint32_t flag)
+static void __no_inline_not_in_flash_func(handle_endpoint_irq)(pio_hw_root_port_t* port, uint32_t flag)
 {
   volatile uint32_t* ep_reg;
   xfer_result_t result;
@@ -200,37 +200,35 @@ void __no_inline_not_in_flash_func(handle_endpoint_irq)(pio_hw_root_port_t* port
 void __no_inline_not_in_flash_func(pio_usb_host_irq_handler)(uint8_t root_id)
 {
   pio_hw_root_port_t* port = PIO_USB_HW_RPORT(root_id);
+  uint32_t const ints = port->ints;
 
-  if ( port->ints & PIO_USB_INTS_CONNECT_BITS )
+  if ( ints & PIO_USB_INTS_CONNECT_BITS )
   {
-    port->ints &= ~PIO_USB_INTS_CONNECT_BITS;
-
     hcd_event_device_attach(root_id+1, true);
   }
 
-  if ( port->ints & PIO_USB_INTS_DISCONNECT_BITS )
+  if ( ints & PIO_USB_INTS_DISCONNECT_BITS )
   {
-    port->ints &= ~PIO_USB_INTS_DISCONNECT_BITS;
     hcd_event_device_remove(root_id+1, true);
   }
 
-  if ( port->ints & PIO_USB_INTS_ENDPOINT_COMPLETE_BITS )
+  if ( ints & PIO_USB_INTS_ENDPOINT_COMPLETE_BITS )
   {
-    port->ints &= ~PIO_USB_INTS_ENDPOINT_COMPLETE_BITS;
     handle_endpoint_irq(port, PIO_USB_INTS_ENDPOINT_COMPLETE_BITS);
   }
 
-  if ( port->ints & PIO_USB_INTS_ENDPOINT_ERROR_BITS )
+  if ( ints & PIO_USB_INTS_ENDPOINT_ERROR_BITS )
   {
-    port->ints &= ~PIO_USB_INTS_ENDPOINT_ERROR_BITS;
     handle_endpoint_irq(port, PIO_USB_INTS_ENDPOINT_ERROR_BITS);
   }
 
-  if ( port->ints & PIO_USB_INTS_ENDPOINT_STALLED_BITS )
+  if ( ints & PIO_USB_INTS_ENDPOINT_STALLED_BITS )
   {
-    port->ints &= ~PIO_USB_INTS_ENDPOINT_STALLED_BITS;
     handle_endpoint_irq(port, PIO_USB_INTS_ENDPOINT_STALLED_BITS);
   }
+
+  // clear all
+  port->ints &= ~ints;
 }
 
 #endif