From 5081d85fe03f44edebdebc4ff715e8d4fabe16cb Mon Sep 17 00:00:00 2001 From: tobozo Date: Thu, 5 Sep 2024 09:51:52 +0200 Subject: [PATCH] Fix for pico sdk 2.0.0 build failing (RP2350 support) --- src/lgfx/v1/platforms/rp2040/common.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/lgfx/v1/platforms/rp2040/common.cpp b/src/lgfx/v1/platforms/rp2040/common.cpp index 96a25024..00ceb575 100644 --- a/src/lgfx/v1/platforms/rp2040/common.cpp +++ b/src/lgfx/v1/platforms/rp2040/common.cpp @@ -36,6 +36,15 @@ Porting for RP2040: #include +#if __has_include("hardware_structs/include/hardware/structs/iobank0.h") + // NOTE: old pico sdk (before rp2350) used enum type for gpio function, iobank was named differently too + #define gpio_function_t enum gpio_function + #define io_bank0_hw_t iobank0_hw_t +#elif ! __has_include("hardware/regs/io_bank0.h") + // expecting gpio_function_t and io_bank0_hw_t + #error "Unsupported pico sdk version, can't find io_bank0.h or iobank0.h to use gpio_function_t and io_bank0_hw_t" +#endif + // #define DEBUG #if defined(DEBUG) @@ -75,7 +84,7 @@ namespace lgfx namespace { - bool lgfx_gpio_set_function(int_fast16_t pin, enum gpio_function fn) + bool lgfx_gpio_set_function(int_fast16_t pin, gpio_function_t fn) { if (pin < 0 || pin >= static_cast(NUM_BANK0_GPIOS)) { @@ -89,7 +98,7 @@ namespace lgfx temp &= ~(PADS_BANK0_GPIO0_IE_BITS | PADS_BANK0_GPIO0_OD_BITS); temp |= PADS_BANK0_GPIO0_IE_BITS; padsbank0_hw->io[pin] = temp; - volatile iobank0_hw_t *iobank0_regs = reinterpret_cast(IO_BANK0_BASE); + volatile io_bank0_hw_t *iobank0_regs = reinterpret_cast(IO_BANK0_BASE); iobank0_regs->io[pin].ctrl = fn << IO_BANK0_GPIO0_CTRL_FUNCSEL_LSB; return true; }