From a7fdaca373af4a8e7f341b2770c2c13953a85ac6 Mon Sep 17 00:00:00 2001
From: Tobias Reinhard <16916681+tobireinhard@users.noreply.github.com>
Date: Sun, 13 Nov 2022 14:52:14 -0500
Subject: [PATCH] Reverted manual rewrites involving const pointers. Automatic
 rewrites are in place.

---
 tasks.c | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/tasks.c b/tasks.c
index d85d47afe..99163e636 100644
--- a/tasks.c
+++ b/tasks.c
@@ -2194,10 +2194,9 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
         eTaskState eReturn;
         #ifdef VERIFAST
             /* Reason for rewrite:
-             * VeriFast does not support the following:
-             * - const pointers
-             * - multiple pointer declarations to user-defined types in single
-             *   statement (i.e., `A p1, p2;` is ok, `A *p1, *p2;` fails)
+             * VeriFast does not support  multiple pointer declarations to 
+             * user-defined types in single statement (i.e., `A p1, p2;` is ok, 
+             * `A *p1, *p2;` fails)
              */
             List_t const * pxStateList;
             List_t const * pxDelayedList;
@@ -2802,14 +2801,7 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB )
 
     void vTaskResume( TaskHandle_t xTaskToResume )
     {
-        #ifdef VERIFAST
-            /* Reason for rewrite:
-            * VeriFast does not support const pointers.
-            */
-            TCB_t * pxTCB = xTaskToResume;
-        #else
-            TCB_t * const pxTCB = xTaskToResume;
-        #endif /* VERIFAST */
+        TCB_t * const pxTCB = xTaskToResume;
 
         /* It does not make sense to resume the calling task. */
         configASSERT( xTaskToResume );
@@ -5432,14 +5424,7 @@ static void prvResetNextTaskUnblockTime( void )
 
     BaseType_t xTaskPriorityDisinherit( TaskHandle_t const pxMutexHolder )
     {
-        #ifdef VERIFAST
-            /* Reason for rewrite:
-            * VeriFast does not support const pointers.
-            */
-           TCB_t * pxTCB = pxMutexHolder;
-        #else
-            TCB_t * const pxTCB = pxMutexHolder;
-        #endif /* VERIFAST */
+        TCB_t * const pxTCB = pxMutexHolder;
         BaseType_t xReturn = pdFALSE;
 
         if( pxMutexHolder != NULL )