Update config macro for xTaskGetCurrentTaskHandle (#1136)

kar-rahul-aws · web-flow · commit a045081f7353 · 2024-09-04T15:01:42.000+05:30
diff --git a/portable/Common/mpu_wrappers.c b/portable/Common/mpu_wrappers.c
@@ -834,7 +834,7 @@
     #endif /* if ( INCLUDE_uxTaskGetStackHighWaterMark2 == 1 ) */
 /*-----------------------------------------------------------*/
 
-    #if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) )
+    #if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_RECURSIVE_MUTEXES == 1 ) )
         TaskHandle_t MPU_xTaskGetCurrentTaskHandle( void ) /* FREERTOS_SYSTEM_CALL */
         {
             TaskHandle_t xReturn;
@@ -856,7 +856,7 @@
 
             return xReturn;
         }
-    #endif /* if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) ) */
+    #endif /* if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_RECURSIVE_MUTEXES == 1 ) ) */
 /*-----------------------------------------------------------*/
 
     #if ( INCLUDE_xTaskGetSchedulerState == 1 )
diff --git a/portable/Common/mpu_wrappers_v2.c b/portable/Common/mpu_wrappers_v2.c
@@ -1172,7 +1172,7 @@
     #endif /* if ( INCLUDE_uxTaskGetStackHighWaterMark2 == 1 ) */
 /*-----------------------------------------------------------*/
 
-    #if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) )
+    #if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_RECURSIVE_MUTEXES == 1 ) )
 
         TaskHandle_t MPU_xTaskGetCurrentTaskHandleImpl( void ) PRIVILEGED_FUNCTION;
 
@@ -1197,7 +1197,7 @@
             return xExternalTaskHandle;
         }
 
-    #endif /* if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) ) */
+    #endif /* if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_RECURSIVE_MUTEXES == 1 ) ) */
 /*-----------------------------------------------------------*/
 
     #if ( INCLUDE_xTaskGetSchedulerState == 1 )
diff --git a/tasks.c b/tasks.c
@@ -6486,7 +6486,7 @@ static void prvResetNextTaskUnblockTime( void )
 }
 /*-----------------------------------------------------------*/
 
-#if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) ) || ( configNUMBER_OF_CORES > 1 )
+#if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_RECURSIVE_MUTEXES == 1 ) ) || ( configNUMBER_OF_CORES > 1 )
 
     #if ( configNUMBER_OF_CORES == 1 )
         TaskHandle_t xTaskGetCurrentTaskHandle( void )
@@ -6544,7 +6544,7 @@ static void prvResetNextTaskUnblockTime( void )
         return xReturn;
     }
 
-#endif /* ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) ) */
+#endif /* ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_RECURSIVE_MUTEXES == 1 ) ) */
 /*-----------------------------------------------------------*/
 
 #if ( ( INCLUDE_xTaskGetSchedulerState == 1 ) || ( configUSE_TIMERS == 1 ) )

Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@`
`834`	`834`	`#endif /* if ( INCLUDE_uxTaskGetStackHighWaterMark2 == 1 ) */`
`835`	`835`	`/-----------------------------------------------------------/`
`836`	`836`
`837`		`- #if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) \|\| ( configUSE_MUTEXES == 1 ) )`
	`837`	`+ #if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) \|\| ( configUSE_RECURSIVE_MUTEXES == 1 ) )`
`838`	`838`	`TaskHandle_t MPU_xTaskGetCurrentTaskHandle( void ) /* FREERTOS_SYSTEM_CALL */`
`839`	`839`	`{`
`840`	`840`	`TaskHandle_t xReturn;`
`@@ -856,7 +856,7 @@`
`856`	`856`
`857`	`857`	`return xReturn;`
`858`	`858`	`}`
`859`		`- #endif /* if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) \|\| ( configUSE_MUTEXES == 1 ) ) */`
	`859`	`+ #endif /* if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) \|\| ( configUSE_RECURSIVE_MUTEXES == 1 ) ) */`
`860`	`860`	`/-----------------------------------------------------------/`
`861`	`861`
`862`	`862`	`#if ( INCLUDE_xTaskGetSchedulerState == 1 )`
Original file line number	Diff line number	Diff line change
`@@ -6486,7 +6486,7 @@ static void prvResetNextTaskUnblockTime( void )`
`6486`	`6486`	`}`
`6487`	`6487`	`/-----------------------------------------------------------/`
`6488`	`6488`
`6489`		`-#if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) \|\| ( configUSE_MUTEXES == 1 ) ) \|\| ( configNUMBER_OF_CORES > 1 )`
	`6489`	`+#if ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) \|\| ( configUSE_RECURSIVE_MUTEXES == 1 ) ) \|\| ( configNUMBER_OF_CORES > 1 )`
`6490`	`6490`
`6491`	`6491`	`#if ( configNUMBER_OF_CORES == 1 )`
`6492`	`6492`	`TaskHandle_t xTaskGetCurrentTaskHandle( void )`
`@@ -6544,7 +6544,7 @@ static void prvResetNextTaskUnblockTime( void )`
`6544`	`6544`	`return xReturn;`
`6545`	`6545`	`}`
`6546`	`6546`
`6547`		`-#endif /* ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) \|\| ( configUSE_MUTEXES == 1 ) ) */`
	`6547`	`+#endif /* ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) \|\| ( configUSE_RECURSIVE_MUTEXES == 1 ) ) */`
`6548`	`6548`	`/-----------------------------------------------------------/`
`6549`	`6549`
`6550`	`6550`	`#if ( ( INCLUDE_xTaskGetSchedulerState == 1 ) \|\| ( configUSE_TIMERS == 1 ) )`