RP2040: Fix use of deprecated volatile semantics for C++20 (#1318)

Mathias Gredal · Mathias Gredal · commit 8d1d7edac9f6 · 2025-09-16T12:49:56.000+02:00
diff --git a/portable/ThirdParty/GCC/RP2040/include/portmacro.h b/portable/ThirdParty/GCC/RP2040/include/portmacro.h
@@ -227,7 +227,7 @@ static inline void vPortRecursiveLock( BaseType_t xCoreID,
             if( ucOwnedByCore[ xCoreID ][ ulLockNum ] )
             {
                 configASSERT( ucRecursionCountByLock[ ulLockNum ] != 255u );
-                ucRecursionCountByLock[ ulLockNum ]++;
+                ucRecursionCountByLock[ ulLockNum ] = ucRecursionCountByLock[ ulLockNum ] + 1;
                 return;
             }
             spin_lock_unsafe_blocking(pxSpinLock);
@@ -241,7 +241,9 @@ static inline void vPortRecursiveLock( BaseType_t xCoreID,
         configASSERT( ( ucOwnedByCore[ xCoreID ] [ulLockNum ] ) != 0 );
         configASSERT( ucRecursionCountByLock[ ulLockNum ] != 0 );
 
-        if( !--ucRecursionCountByLock[ ulLockNum ] )
+        uint8_t uc = ucRecursionCountByLock[ ulLockNum] - 1;
+        ucRecursionCountByLock[ulLockNum] = uc;
+        if (uc == 0U)
         {
             ucOwnedByCore[ xCoreID ] [ ulLockNum ] = 0;
             spin_unlock_unsafe(pxSpinLock);

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ static inline void vPortRecursiveLock( BaseType_t xCoreID,`
`227`	`227`	`if( ucOwnedByCore[ xCoreID ][ ulLockNum ] )`
`228`	`228`	`{`
`229`	`229`	`configASSERT( ucRecursionCountByLock[ ulLockNum ] != 255u );`
`230`		`- ucRecursionCountByLock[ ulLockNum ]++;`
	`230`	`+ ucRecursionCountByLock[ ulLockNum ] = ucRecursionCountByLock[ ulLockNum ] + 1;`
`231`	`231`	`return;`
`232`	`232`	`}`
`233`	`233`	`spin_lock_unsafe_blocking(pxSpinLock);`
`@@ -241,7 +241,9 @@ static inline void vPortRecursiveLock( BaseType_t xCoreID,`
`241`	`241`	`configASSERT( ( ucOwnedByCore[ xCoreID ] [ulLockNum ] ) != 0 );`
`242`	`242`	`configASSERT( ucRecursionCountByLock[ ulLockNum ] != 0 );`
`243`	`243`
`244`		`- if( !--ucRecursionCountByLock[ ulLockNum ] )`
	`244`	`+ uint8_t uc = ucRecursionCountByLock[ ulLockNum] - 1;`
	`245`	`+ ucRecursionCountByLock[ulLockNum] = uc;`
	`246`	`+ if (uc == 0U)`
`245`	`247`	`{`
`246`	`248`	`ucOwnedByCore[ xCoreID ] [ ulLockNum ] = 0;`
`247`	`249`	`spin_unlock_unsafe(pxSpinLock);`