mirror/pico-sdk
1
0
Fork 0
mirror of https://github.com/raspberrypi/pico-sdk.git synced 2025-04-17 08:45:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixups to compile with TF-M

Browse Source 
TF-M requires c99 compatibility, which throws errors at these lines

This patch fixes those errors and is currently applied by TF-M when cloning the SDK, but it would be better to get it into the SDK by default so that patch isn't needed
This commit is contained in:
William Vinnicombe 2025-04-08 14:28:54 +01:00
parent 93ea261677
commit 71fd66c40d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/pico_sync/sem.c
View File

@ -15,7 +15,7 @@ void sem_init(semaphore_t *sem, int16_t initial_permits, int16_t max_permits) {
}
int __time_critical_func(sem_available)(semaphore_t *sem) {
#ifdef __GNUC__
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
return *(volatile typeof(sem->permits) *) &sem->permits;
#else
static_assert(sizeof(sem->permits) == 2, "");

2
src/rp2_common/hardware_flash/flash.c
View File

@ -299,7 +299,7 @@ static void flash_devinfo_update_field(uint16_t wdata, uint16_t mask) {
// Boot RAM does not support exclusives, but does support RWTYPE SET/CLR/XOR (with byte
// strobes). Can't use hw_write_masked because it performs a 32-bit write.
io_rw_16 *devinfo = flash_devinfo_ptr();
*hw_xor_alias(devinfo) = (*devinfo ^ wdata) & mask;
*(io_rw_32 *)hw_xor_alias_untyped(devinfo) = (*devinfo ^ wdata) & mask;
}
// This is a RAM function because may be called during flash programming to enable save/restore of

4
src/rp2_common/pico_multicore/multicore.c
View File

@ -101,8 +101,8 @@ int core1_wrapper(int (*entry)(void), void *stack_base) {
void multicore_reset_core1(void) {
// Use atomic aliases just in case core 1 is also manipulating some PSM state
io_rw_32 *power_off = (io_rw_32 *) (PSM_BASE + PSM_FRCE_OFF_OFFSET);
io_rw_32 *power_off_set = hw_set_alias(power_off);
io_rw_32 *power_off_clr = hw_clear_alias(power_off);
io_rw_32 *power_off_set = hw_set_alias_untyped(power_off);
io_rw_32 *power_off_clr = hw_clear_alias_untyped(power_off);
// Hard-reset core 1.
// Reading back confirms the core 1 reset is in the correct state, but also