Fix compatibility with old SDK versions

adafruit · Dec 20, 2024 · 38186c1 · 38186c1
1 parent a7d2b61
commit 38186c1
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 16 deletions.
diff --git a/src/pio_usb.c b/src/pio_usb.c
@@ -306,7 +306,7 @@ static void apply_config(pio_port_t *pp, const pio_usb_configuration_t *c,
     pp->ls_tx_program = &usb_tx_dpdm_program;
   }
 
-#if PICO_PIO_USE_GPIO_BASE
+#if defined(PICO_PIO_USE_GPIO_BASE) && PICO_PIO_USE_GPIO_BASE+0
   if (highest_pin > 32) {
     pio_set_gpio_base(pp->pio_usb_tx, 16);
     pio_set_gpio_base(pp->pio_usb_rx, 16);

diff --git a/src/sdk_compat.h b/src/sdk_compat.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#if PICO_SDK_VERSION_MAJOR < 2
+static __always_inline void pio_sm_set_jmp_pin(PIO pio, uint sm, uint jmp_pin) {
+  pio->sm[sm].execctrl =
+      (pio->sm[sm].execctrl & ~PIO_SM0_EXECCTRL_JMP_PIN_BITS) |
+      (jmp_pin << PIO_SM0_EXECCTRL_JMP_PIN_LSB);
+}
+#endif
+
+#if PICO_SDK_VERSION_MAJOR < 2 || (PICO_SDK_VERSION_MAJOR == 2 && PICO_SDK_VERSION_MINOR < 1)
+static void pio_sm_set_pins_with_mask64(PIO pio, uint sm, uint64_t pin_values, uint64_t pin_mask) {
+    pio_sm_set_pins_with_mask(pio, sm, (uint32_t) pin_values, (uint32_t) pin_mask);
+}
+
+static void pio_sm_set_pindirs_with_mask64(PIO pio, uint sm, uint64_t pin_values, uint64_t pin_mask) {
+    pio_sm_set_pindirs_with_mask(pio, sm, (uint32_t) pin_values, (uint32_t) pin_mask);
+}
+#endif
+
diff --git a/src/usb_rx.pio b/src/usb_rx.pio
@@ -155,14 +155,7 @@ J2:
 
 % c-sdk {
 #include "hardware/clocks.h"
-
-#if PICO_SDK_VERSION_MAJOR < 2
-static __always_inline void pio_sm_set_jmp_pin(PIO pio, uint sm, uint jmp_pin) {
-  pio->sm[sm].execctrl =
-      (pio->sm[sm].execctrl & ~PIO_SM0_EXECCTRL_JMP_PIN_BITS) |
-      (jmp_pin << PIO_SM0_EXECCTRL_JMP_PIN_LSB);
-}
-#endif
+#include "sdk_compat.h"
 
 static inline void usb_rx_fs_program_init(PIO pio, uint sm, uint offset, uint pin_dp, uint pin_dm, int pin_debug) {
   if (pin_dp < pin_dm) {

diff --git a/src/usb_rx.pio.h b/src/usb_rx.pio.h
@@ -173,13 +173,7 @@ static inline pio_sm_config usb_nrzi_decoder_debug_program_get_default_config(ui
 }
 
 #include "hardware/clocks.h"
-#if PICO_SDK_VERSION_MAJOR < 2
-static __always_inline void pio_sm_set_jmp_pin(PIO pio, uint sm, uint jmp_pin) {
-  pio->sm[sm].execctrl =
-      (pio->sm[sm].execctrl & ~PIO_SM0_EXECCTRL_JMP_PIN_BITS) |
-      (jmp_pin << PIO_SM0_EXECCTRL_JMP_PIN_LSB);
-}
-#endif
+#include "sdk_compat.h"
 static inline void usb_rx_fs_program_init(PIO pio, uint sm, uint offset, uint pin_dp, uint pin_dm, int pin_debug) {
   if (pin_dp < pin_dm) {
     pio_sm_set_consecutive_pindirs(pio, sm, pin_dp, 2, false);

diff --git a/src/usb_tx.pio b/src/usb_tx.pio
@@ -91,6 +91,7 @@ set pindirs, 0b11   side FJ_LK
 
 % c-sdk {
 #include "hardware/clocks.h"
+#include "sdk_compat.h"
 
   static void __no_inline_not_in_flash_func(usb_tx_configure_pins)(PIO pio, uint sm, uint pin_dp, uint pin_dm) {
     if (pin_dp < pin_dm) {

diff --git a/src/usb_tx.pio.h b/src/usb_tx.pio.h
@@ -138,6 +138,7 @@ static inline pio_sm_config usb_tx_pre_dmdp_program_get_default_config(uint offs
 }
 
 #include "hardware/clocks.h"
+#include "sdk_compat.h"
   static void __no_inline_not_in_flash_func(usb_tx_configure_pins)(PIO pio, uint sm, uint pin_dp, uint pin_dm) {
     if (pin_dp < pin_dm) {
       pio_sm_set_out_pins(pio, sm, pin_dp, 2);