From fc7aca7ff239ac988b7cb28a73ca6c66f4efcb84 Mon Sep 17 00:00:00 2001
From: Darian <32921628+Dazza0@users.noreply.github.com>
Date: Mon, 23 Oct 2023 15:20:24 +0800
Subject: [PATCH] Rename CPU to Core (#849)

This commit renames "CPU" to "Core" for any public facing API for consistency
with other SMP related APIs (e.g., "configNUMBER_OF_CORES").

Co-authored-by: Gaurav-Aggarwal-AWS <33462878+aggarg@users.noreply.github.com>
---
 include/FreeRTOS.h | 8 ++++----
 include/task.h     | 2 +-
 tasks.c            | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/FreeRTOS.h b/include/FreeRTOS.h
index ba7d083a625..b8153ac64dd 100644
--- a/include/FreeRTOS.h
+++ b/include/FreeRTOS.h
@@ -2120,12 +2120,12 @@
     #define traceRETURN_xTaskGetCurrentTaskHandle( xReturn )
 #endif
 
-#ifndef traceENTER_xTaskGetCurrentTaskHandleCPU
-    #define traceENTER_xTaskGetCurrentTaskHandleCPU( xCoreID )
+#ifndef traceENTER_xTaskGetCurrentTaskHandleForCore
+    #define traceENTER_xTaskGetCurrentTaskHandleForCore( xCoreID )
 #endif
 
-#ifndef traceRETURN_xTaskGetCurrentTaskHandleCPU
-    #define traceRETURN_xTaskGetCurrentTaskHandleCPU( xReturn )
+#ifndef traceRETURN_xTaskGetCurrentTaskHandleForCore
+    #define traceRETURN_xTaskGetCurrentTaskHandleForCore( xReturn )
 #endif
 
 #ifndef traceENTER_xTaskGetSchedulerState
diff --git a/include/task.h b/include/task.h
index b6850e8bdb7..c369f0c1d31 100644
--- a/include/task.h
+++ b/include/task.h
@@ -3539,7 +3539,7 @@ TaskHandle_t xTaskGetCurrentTaskHandle( void ) PRIVILEGED_FUNCTION;
 /*
  * Return the handle of the task running on specified core.
  */
-TaskHandle_t xTaskGetCurrentTaskHandleCPU( BaseType_t xCoreID ) PRIVILEGED_FUNCTION;
+TaskHandle_t xTaskGetCurrentTaskHandleForCore( BaseType_t xCoreID ) PRIVILEGED_FUNCTION;
 
 /*
  * Shortcut used by the queue implementation to prevent unnecessary call to
diff --git a/tasks.c b/tasks.c
index e941907cf9c..d74a4ccac88 100644
--- a/tasks.c
+++ b/tasks.c
@@ -6425,18 +6425,18 @@ static void prvResetNextTaskUnblockTime( void )
             return xReturn;
         }
 
-        TaskHandle_t xTaskGetCurrentTaskHandleCPU( BaseType_t xCoreID )
+        TaskHandle_t xTaskGetCurrentTaskHandleForCore( BaseType_t xCoreID )
         {
             TaskHandle_t xReturn = NULL;
 
-            traceENTER_xTaskGetCurrentTaskHandleCPU( xCoreID );
+            traceENTER_xTaskGetCurrentTaskHandleForCore( xCoreID );
 
             if( taskVALID_CORE_ID( xCoreID ) != pdFALSE )
             {
                 xReturn = pxCurrentTCBs[ xCoreID ];
             }
 
-            traceRETURN_xTaskGetCurrentTaskHandleCPU( xReturn );
+            traceRETURN_xTaskGetCurrentTaskHandleForCore( xReturn );
 
             return xReturn;
         }