Update USB host to work on RP2350B high pins

adafruit · Dec 20, 2024 · 72cceaf · 72cceaf
1 parent af0cdc4
commit 72cceaf
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/ports/raspberrypi/common-hal/usb_host/Port.c b/ports/raspberrypi/common-hal/usb_host/Port.c
@@ -96,6 +96,20 @@ static bool _has_program_room(uint8_t pio_index, uint8_t program_size) {
     return pio_can_add_program(pio, &program_struct);
 }
 
+// from pico-sdk/src/rp2_common/hardware_pio/pio.c
+static bool is_gpio_compatible(PIO pio, uint32_t used_gpio_ranges) {
+    #if PICO_PIO_VERSION > 0
+    bool gpio_base = pio_get_gpio_base(pio);
+    return !((gpio_base && (used_gpio_ranges & 1)) ||
+        (!gpio_base && (used_gpio_ranges & 4)));
+    #else
+    ((void)pio);
+    ((void)used_gpio_ranges);
+    return true;
+    #endif
+}
+
+
 usb_host_port_obj_t *common_hal_usb_host_port_construct(const mcu_pin_obj_t *dp, const mcu_pin_obj_t *dm) {
     if (dp->number + 1 != dm->number) {
         raise_ValueError_invalid_pins();
@@ -113,15 +127,31 @@ usb_host_port_obj_t *common_hal_usb_host_port_construct(const mcu_pin_obj_t *dp,
     assert_pin_free(dp);
     assert_pin_free(dm);
 
+    #if PICO_PIO_VERSION > 0
+    uint32_t used_gpio_ranges = 0;
+    #else
+    uint gpio_base = dm->number;
+    uint gpio_count = 2;
+    uint32_t required_gpio_ranges = (1u << (gpio_base >> 4)) |
+        (1u << ((gpio_base + gpio_count - 1) >> 4));
+    #endif
+
     pio_usb_configuration_t pio_cfg = PIO_USB_DEFAULT_CONFIG;
     pio_cfg.skip_alarm_pool = true;
     pio_cfg.pin_dp = dp->number;
     // Allocating the peripherals like this works on Pico W, where the
     // "preferred PIO" for the cyw43 wifi chip is PIO 1.
     pio_cfg.pio_tx_num = 1; // uses 22 instructions and 1 SM
     pio_cfg.pio_rx_num = 0; // uses 31 instructions and 2 SM.
-    if (!_has_program_room(pio_cfg.pio_tx_num, 22) || _sm_free_count(pio_cfg.pio_tx_num) < 1 ||
-        !_has_program_room(pio_cfg.pio_rx_num, 31) || _sm_free_count(pio_cfg.pio_rx_num) < 2) {
+    uint8_t tx_sm_free = _sm_free_count(pio_cfg.pio_tx_num);
+    uint8_t rx_sm_free = _sm_free_count(pio_cfg.pio_rx_num);
+    PIO pio_tx = pio_instances[pio_cfg.pio_tx_num];
+    PIO pio_rx = pio_instances[pio_cfg.pio_rx_num];
+
+    if (!_has_program_room(pio_cfg.pio_tx_num, 22) || tx_sm_free < 1 ||
+        !(tx_sm_free == 4 || is_gpio_compatible(pio_tx, used_gpio_ranges)) ||
+        !_has_program_room(pio_cfg.pio_rx_num, 31) || rx_sm_free < 2 ||
+        !(rx_sm_free == 4 || is_gpio_compatible(pio_rx, used_gpio_ranges))) {
         mp_raise_RuntimeError(MP_ERROR_TEXT("All state machines in use"));
     }
     pio_cfg.tx_ch = dma_claim_unused_channel(false); // DMA channel

diff --git a/ports/raspberrypi/lib/Pico-PIO-USB b/ports/raspberrypi/lib/Pico-PIO-USB
diff --git a/ports/raspberrypi/sdk_config/pico/version.h b/ports/raspberrypi/sdk_config/pico/version.h
@@ -12,8 +12,8 @@
 #define _PICO_VERSION_H
 
 #define PICO_SDK_VERSION_MAJOR    2
-#define PICO_SDK_VERSION_MINOR    0
+#define PICO_SDK_VERSION_MINOR    1
 #define PICO_SDK_VERSION_REVISION 0
-#define PICO_SDK_VERSION_STRING   "2.0.0"
+#define PICO_SDK_VERSION_STRING   "2.1.0"
 
 #endif
+1 −2		.github/workflows/build.yml
+1 −2		README.md
+0 −1		examples/CMakeLists.txt
+0 −15		examples/capture_hid_report/CMakeLists.txt
+0 −77		examples/capture_hid_report/capture_hid_report.c
+19 −4		src/pio_usb.c
+0 −640		src/pio_usb_host.c
+20 −0		src/sdk_compat.h
+6 −13		src/usb_rx.pio
+5 −11		src/usb_rx.pio.h
+4 −3		src/usb_tx.pio
+3 −2		src/usb_tx.pio.h