From 1e7e0c730d60ee8610041efac09115ef07db6dc1 Mon Sep 17 00:00:00 2001 From: William Vinnicombe Date: Fri, 22 Nov 2024 10:31:48 +0000 Subject: [PATCH] Fix Risc-V build RCP mask constants still need to be accessed from Risc-V --- src/rp2_common/hardware_rcp/include/hardware/rcp.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rp2_common/hardware_rcp/include/hardware/rcp.h b/src/rp2_common/hardware_rcp/include/hardware/rcp.h index b75f182d9..92ec9d6d2 100644 --- a/src/rp2_common/hardware_rcp/include/hardware/rcp.h +++ b/src/rp2_common/hardware_rcp/include/hardware/rcp.h @@ -15,13 +15,15 @@ */ // ---------------------------------------------------------------------------- -// RCP instructions (this header is Arm-only) -#if defined(PICO_RP2350) && !defined(__riscv) +// RCP masks (this header is RP2350 only) +#if defined(PICO_RP2350) #define RCP_MASK_TRUE _u(0xa500a500) #define RCP_MASK_FALSE _u(0x00c300c3) #define RCP_MASK_INTXOR _u(0x96009600) +// RCP instructions (this header is Arm-only) +#if !defined(__riscv) // ---------------------------------------------------------------------------- // Macros and inline functions for use in C files #ifndef __ASSEMBLER__ @@ -995,6 +997,7 @@ rcp_switch_u8_to_ch_cl rcp_canary_check_nodelay_impl \tag, \x .endm #endif // !__riscv +#endif // PICO_RP2350 #endif // __ASSEMBLER__ // ----------------------------------------------------------------------------