Update critical nesting macros for SMP

This is required for the change introduced in FreeRTOS/FreeRTOS-Kernel#1206 Signed-off-by: Gaurav Aggarwal <[email protected]>
aggarg · Dec 23, 2024 · 3fbc162 · 3fbc162
1 parent 8b2955f
commit 3fbc162
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/GCC/RP2350_ARM_NTZ/non_secure/port.c b/GCC/RP2350_ARM_NTZ/non_secure/port.c
@@ -867,7 +867,7 @@ static void prvTaskExitError( void )
      * should instead call vTaskDelete( NULL ). Artificially force an assert()
      * to be triggered if configASSERT() is defined, then stop here so
      * application writers can catch the error. */
-    configASSERT( portGET_CRITICAL_NESTING_COUNT() == ~0UL );
+    configASSERT( portGET_CRITICAL_NESTING_COUNT( 0 ) == ~0UL );
     portDISABLE_INTERRUPTS();
 
     while( ulDummy == 0 )

diff --git a/GCC/RP2350_ARM_NTZ/non_secure/portmacro.h b/GCC/RP2350_ARM_NTZ/non_secure/portmacro.h
@@ -153,13 +153,13 @@ void vYieldCore( int xCoreID );
 
 /* Critical nesting count management. */
 #if configNUMBER_OF_CORES == 1
-#define portGET_CRITICAL_NESTING_COUNT()          ulCriticalNesting
+#define portGET_CRITICAL_NESTING_COUNT( xCoreID )          ulCriticalNesting
 #else
 extern volatile uint32_t ulCriticalNestings[ configNUMBER_OF_CORES ];
-#define portGET_CRITICAL_NESTING_COUNT()          ( ulCriticalNestings[ portGET_CORE_ID() ] )
-#define portSET_CRITICAL_NESTING_COUNT( x )       ( ulCriticalNestings[ portGET_CORE_ID() ] = ( x ) )
-#define portINCREMENT_CRITICAL_NESTING_COUNT()    ( ulCriticalNestings[ portGET_CORE_ID() ]++ )
-#define portDECREMENT_CRITICAL_NESTING_COUNT()    ( ulCriticalNestings[ portGET_CORE_ID() ]-- )
+#define portGET_CRITICAL_NESTING_COUNT( xCoreID )          ( ulCriticalNestings[ ( xCoreID ) ] )
+#define portSET_CRITICAL_NESTING_COUNT( xCoreID, x )       ( ulCriticalNestings[ ( xCoreID ) ] = ( x ) )
+#define portINCREMENT_CRITICAL_NESTING_COUNT( xCoreID )    ( ulCriticalNestings[ ( xCoreID ) ]++ )
+#define portDECREMENT_CRITICAL_NESTING_COUNT( xCoreID )    ( ulCriticalNestings[ ( xCoreID ) ]-- )
 #endif
 /*-----------------------------------------------------------*/
 

diff --git a/GCC/RP2350_RISC-V/include/portmacro.h b/GCC/RP2350_RISC-V/include/portmacro.h
@@ -161,7 +161,7 @@ extern void vPortYield(void);
 
 #if ( configNUMBER_OF_CORES == 1 )
 extern size_t xCriticalNesting;
-#define portGET_CRITICAL_NESTING_COUNT()          xCriticalNesting
+#define portGET_CRITICAL_NESTING_COUNT( xCoreID )          xCriticalNesting
 #define portENTER_CRITICAL()      \
     {                             \
         portDISABLE_INTERRUPTS(); \
@@ -190,10 +190,10 @@ extern void vTaskExitCriticalFromISR( UBaseType_t uxSavedInterruptStatus );
 #define portENTER_CRITICAL_FROM_ISR()      vTaskEnterCriticalFromISR()
 #define portEXIT_CRITICAL_FROM_ISR( x )    vTaskExitCriticalFromISR( x )
 
-#define portGET_CRITICAL_NESTING_COUNT()          ( xCriticalNestings[ portGET_CORE_ID() ] )
-#define portSET_CRITICAL_NESTING_COUNT( x )       ( xCriticalNestings[ portGET_CORE_ID() ] = ( x ) )
-#define portINCREMENT_CRITICAL_NESTING_COUNT()    ( xCriticalNestings[ portGET_CORE_ID() ]++ )
-#define portDECREMENT_CRITICAL_NESTING_COUNT()    ( xCriticalNestings[ portGET_CORE_ID() ]-- )
+#define portGET_CRITICAL_NESTING_COUNT( xCoreID )          ( xCriticalNestings[ ( xCoreID ) ] )
+#define portSET_CRITICAL_NESTING_COUNT( xCoreID, x )       ( xCriticalNestings[ ( xCoreID ) ] = ( x ) )
+#define portINCREMENT_CRITICAL_NESTING_COUNT( xCoreID )    ( xCriticalNestings[ ( xCoreID ) ]++ )
+#define portDECREMENT_CRITICAL_NESTING_COUNT( xCoreID )    ( xCriticalNestings[ ( xCoreID ) ]-- )
 
 #endif /* if ( configNUMBER_OF_CORES == 1 ) */