Remove coverhd.h

This header file contained timing overhead values which are hard to
maintain.

Update #3254.

60 files changed, 113 insertions, 146 deletions

diff --git a/testsuites/tmtests/tm01/system.h b/testsuites/tmtests/tm01/system.h
index a661b80824..d5f4db8745 100644
--- a/testsuites/tmtests/tm01/system.h
+++ b/testsuites/tmtests/tm01/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm01/task1.c b/testsuites/tmtests/tm01/task1.c
index 98f9f053f2..3062eae9c4 100644
--- a/testsuites/tmtests/tm01/task1.c
+++ b/testsuites/tmtests/tm01/task1.c
@@ -92,7 +92,7 @@ rtems_task Test_task(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_SEMAPHORE_CREATE
+    0
   );
 
   /* Time one invocation of rtems_semaphore_delete */
@@ -105,7 +105,7 @@ rtems_task Test_task(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_SEMAPHORE_CREATE
+    0
   );
 
   status = rtems_semaphore_create(
@@ -168,7 +168,7 @@ rtems_task Test_task(
     semaphore_obtain_time,
     OPERATION_COUNT * OPERATION_COUNT,
     semaphore_obtain_loop_time,
-    CALLING_OVERHEAD_SEMAPHORE_OBTAIN
+    0
   );
 
   put_time(
@@ -176,7 +176,7 @@ rtems_task Test_task(
     semaphore_obtain_no_wait_time,
     OPERATION_COUNT * OPERATION_COUNT,
     semaphore_obtain_loop_time,
-    CALLING_OVERHEAD_SEMAPHORE_OBTAIN
+    0
   );
 
   put_time(
@@ -184,7 +184,7 @@ rtems_task Test_task(
     semaphore_release_time,
     OPERATION_COUNT * OPERATION_COUNT * 2,
     semaphore_release_loop_time * 2,
-    CALLING_OVERHEAD_SEMAPHORE_RELEASE
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm02/system.h b/testsuites/tmtests/tm02/system.h
index 2b070749ac..11f1916973 100644
--- a/testsuites/tmtests/tm02/system.h
+++ b/testsuites/tmtests/tm02/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm02/task1.c b/testsuites/tmtests/tm02/task1.c
index b3761502be..f9e159929a 100644
--- a/testsuites/tmtests/tm02/task1.c
+++ b/testsuites/tmtests/tm02/task1.c
@@ -175,7 +175,7 @@ rtems_task Low_task(
     end_time,
     operation_count - 1,
     0,
-    CALLING_OVERHEAD_SEMAPHORE_OBTAIN
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm03/system.h b/testsuites/tmtests/tm03/system.h
index 2b070749ac..11f1916973 100644
--- a/testsuites/tmtests/tm03/system.h
+++ b/testsuites/tmtests/tm03/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm03/task1.c b/testsuites/tmtests/tm03/task1.c
index 42126ac8a5..f54e1f224a 100644
--- a/testsuites/tmtests/tm03/task1.c
+++ b/testsuites/tmtests/tm03/task1.c
@@ -167,7 +167,7 @@ rtems_task High_task(
     end_time,
     operation_count - 1,
     0,
-    CALLING_OVERHEAD_SEMAPHORE_RELEASE
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm04/system.h b/testsuites/tmtests/tm04/system.h
index 3da9bf8c0c..764b979416 100644
--- a/testsuites/tmtests/tm04/system.h
+++ b/testsuites/tmtests/tm04/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm04/task1.c b/testsuites/tmtests/tm04/task1.c
index 7be2afd7c1..40cca6cf6f 100644
--- a/testsuites/tmtests/tm04/task1.c
+++ b/testsuites/tmtests/tm04/task1.c
@@ -104,7 +104,7 @@ rtems_task Highest_task(
       end_time,
       1,
       0,
-      CALLING_OVERHEAD_TASK_RESTART
+      0
     );
 
     status = rtems_task_set_priority(
@@ -123,7 +123,7 @@ rtems_task Highest_task(
       end_time,
       1,
       0,
-      CALLING_OVERHEAD_TASK_RESTART
+      0
     );
 
     status = rtems_task_delete( RTEMS_SELF );
@@ -170,7 +170,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     0,
-    CALLING_OVERHEAD_SEMAPHORE_RELEASE
+    0
   );
 
   name = rtems_build_name( 'T', 'I', 'M', 'E' );
@@ -197,7 +197,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TASK_CREATE
+    0
   );
 
   benchmark_timer_initialize();
@@ -211,7 +211,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TASK_START
+    0
   );
 
   for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
@@ -247,7 +247,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TASK_RESTART
+    0
   );
 
   for ( index=1 ; index <= OPERATION_COUNT ; index++ )
@@ -263,7 +263,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TASK_DELETE
+    0
   );
 
   for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
@@ -291,7 +291,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TASK_RESTART
+    0
   );
 
   for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
@@ -313,7 +313,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TASK_RESTART
+    0
   );
 
   /* yield processor -- tasks block */
@@ -330,7 +330,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TASK_DELETE
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm05/system.h b/testsuites/tmtests/tm05/system.h
index 29a25acd03..d56e17903a 100644
--- a/testsuites/tmtests/tm05/system.h
+++ b/testsuites/tmtests/tm05/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm05/task1.c b/testsuites/tmtests/tm05/task1.c
index d1485e25bd..e23d03bdc1 100644
--- a/testsuites/tmtests/tm05/task1.c
+++ b/testsuites/tmtests/tm05/task1.c
@@ -101,7 +101,7 @@ rtems_task High_task(
     end_time,
     operation_count,
     0,
-    CALLING_OVERHEAD_TASK_RESUME
+    0
   );
 
   TEST_END();
@@ -130,7 +130,7 @@ rtems_task Low_task(
     end_time,
     operation_count,
     0,
-    CALLING_OVERHEAD_TASK_SUSPEND
+    0
   );
 
   Task_index = 1;
diff --git a/testsuites/tmtests/tm06/system.h b/testsuites/tmtests/tm06/system.h
index 29a25acd03..d56e17903a 100644
--- a/testsuites/tmtests/tm06/system.h
+++ b/testsuites/tmtests/tm06/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm06/task1.c b/testsuites/tmtests/tm06/task1.c
index a784f9cfac..f419c997d9 100644
--- a/testsuites/tmtests/tm06/task1.c
+++ b/testsuites/tmtests/tm06/task1.c
@@ -94,7 +94,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TASK_RESTART
+    0
   );
 
   for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
@@ -122,7 +122,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     0,
-    CALLING_OVERHEAD_TASK_SUSPEND
+    0
   );
 
   benchmark_timer_initialize();
@@ -135,7 +135,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     0,
-    CALLING_OVERHEAD_TASK_RESUME
+    0
   );
 
   benchmark_timer_initialize();
@@ -148,7 +148,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     0,
-    CALLING_OVERHEAD_TASK_RESUME
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm07/system.h b/testsuites/tmtests/tm07/system.h
index 29a25acd03..d56e17903a 100644
--- a/testsuites/tmtests/tm07/system.h
+++ b/testsuites/tmtests/tm07/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm07/task1.c b/testsuites/tmtests/tm07/task1.c
index a14f1a8f23..eca64dbc0c 100644
--- a/testsuites/tmtests/tm07/task1.c
+++ b/testsuites/tmtests/tm07/task1.c
@@ -95,7 +95,7 @@ rtems_task High_task(
       end_time,
       operation_count,
       0,
-      CALLING_OVERHEAD_TASK_RESTART
+      0
     );
   } else
     (void) rtems_task_suspend( RTEMS_SELF );
diff --git a/testsuites/tmtests/tm08/system.h b/testsuites/tmtests/tm08/system.h
index 5e83418f29..ff756e4443 100644
--- a/testsuites/tmtests/tm08/system.h
+++ b/testsuites/tmtests/tm08/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c
index a86322c61f..dd9b4793f8 100644
--- a/testsuites/tmtests/tm08/task1.c
+++ b/testsuites/tmtests/tm08/task1.c
@@ -102,7 +102,7 @@ rtems_task test_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TASK_SET_PRIORITY
+    0
   );
 
   benchmark_timer_initialize();
@@ -120,7 +120,7 @@ rtems_task test_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TASK_SET_PRIORITY
+    0
   );
 
   benchmark_timer_initialize();
@@ -137,7 +137,7 @@ rtems_task test_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TASK_MODE
+    0
   );
 
   benchmark_timer_initialize();
@@ -160,7 +160,7 @@ rtems_task test_task(
     end_time,
     OPERATION_COUNT * 2,
     overhead,
-    CALLING_OVERHEAD_TASK_MODE
+    0
   );
 
   benchmark_timer_initialize();                 /* must be one host */
@@ -172,7 +172,7 @@ rtems_task test_task(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_TASK_MODE
+    0
   );
 
   status = rtems_task_mode( RTEMS_NO_PREEMPT, RTEMS_PREEMPT_MASK, &old_mode );
@@ -197,7 +197,7 @@ rtems_task test_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_CLOCK_SET
+    0
   );
 
   benchmark_timer_initialize();
@@ -210,7 +210,7 @@ rtems_task test_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_CLOCK_GET
+    0
   );
 
   TEST_END();
@@ -228,7 +228,7 @@ rtems_task test_task1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_TASK_MODE
+    0
   );
 
   (void) rtems_task_suspend( RTEMS_SELF );
diff --git a/testsuites/tmtests/tm09/system.h b/testsuites/tmtests/tm09/system.h
index 86a291b5a8..76a97511ed 100644
--- a/testsuites/tmtests/tm09/system.h
+++ b/testsuites/tmtests/tm09/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c
index ff81571b5f..ff28ca2398 100644
--- a/testsuites/tmtests/tm09/task1.c
+++ b/testsuites/tmtests/tm09/task1.c
@@ -69,7 +69,7 @@ rtems_task Test_task (
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_CREATE
+    0
   );
 
   queue_test();
@@ -83,7 +83,7 @@ rtems_task Test_task (
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_DELETE
+    0
   );
 
   TEST_END();
@@ -190,7 +190,7 @@ void queue_test(void)
     send_time,
     OPERATION_COUNT * OPERATION_COUNT,
     send_loop_time,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_SEND
+    0
   );
 
   put_time(
@@ -198,7 +198,7 @@ void queue_test(void)
     urgent_time,
     OPERATION_COUNT * OPERATION_COUNT,
     urgent_loop_time,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT
+    0
   );
 
   put_time(
@@ -206,7 +206,7 @@ void queue_test(void)
     receive_time,
     OPERATION_COUNT * OPERATION_COUNT * 2,
     receive_loop_time * 2,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_RECEIVE
+    0
   );
 
   put_time(
@@ -214,7 +214,7 @@ void queue_test(void)
     empty_flush_time,
     OPERATION_COUNT,
     0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_FLUSH
+    0
   );
 
   put_time(
@@ -222,7 +222,7 @@ void queue_test(void)
     flush_time,
     OPERATION_COUNT,
     0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_FLUSH
+    0
   );
 
 }
diff --git a/testsuites/tmtests/tm10/system.h b/testsuites/tmtests/tm10/system.h
index 8403656b52..c4c8161ffb 100644
--- a/testsuites/tmtests/tm10/system.h
+++ b/testsuites/tmtests/tm10/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c
index f7e4d27af4..884af48ff2 100644
--- a/testsuites/tmtests/tm10/task1.c
+++ b/testsuites/tmtests/tm10/task1.c
@@ -116,7 +116,7 @@ void test_init()
     end_time,
     operation_count,
     overhead,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_RECEIVE
+    0
   );
 
 }
@@ -164,7 +164,7 @@ rtems_task Low_task(
     end_time,
     operation_count - 1,
     0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_RECEIVE
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm11/system.h b/testsuites/tmtests/tm11/system.h
index b36266b04b..a03bcda70e 100644
--- a/testsuites/tmtests/tm11/system.h
+++ b/testsuites/tmtests/tm11/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c
index 01beb797e7..e6061cea46 100644
--- a/testsuites/tmtests/tm11/task1.c
+++ b/testsuites/tmtests/tm11/task1.c
@@ -154,7 +154,7 @@ rtems_task High_task(
     end_time,
     operation_count,
     0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_SEND
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm12/system.h b/testsuites/tmtests/tm12/system.h
index b36266b04b..a03bcda70e 100644
--- a/testsuites/tmtests/tm12/system.h
+++ b/testsuites/tmtests/tm12/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c
index dcd84c6216..1e6064ff11 100644
--- a/testsuites/tmtests/tm12/task1.c
+++ b/testsuites/tmtests/tm12/task1.c
@@ -131,7 +131,7 @@ rtems_task High_task(
     end_time,
     operation_count - 1,
     overhead,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_SEND
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm13/system.h b/testsuites/tmtests/tm13/system.h
index b36266b04b..a03bcda70e 100644
--- a/testsuites/tmtests/tm13/system.h
+++ b/testsuites/tmtests/tm13/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c
index eac1b8bd7c..884723a5ab 100644
--- a/testsuites/tmtests/tm13/task1.c
+++ b/testsuites/tmtests/tm13/task1.c
@@ -155,7 +155,7 @@ rtems_task High_task(
     end_time,
     operation_count,
     0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm14/system.h b/testsuites/tmtests/tm14/system.h
index b36266b04b..a03bcda70e 100644
--- a/testsuites/tmtests/tm14/system.h
+++ b/testsuites/tmtests/tm14/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c
index 8a7a5d7e59..74de9d4af9 100644
--- a/testsuites/tmtests/tm14/task1.c
+++ b/testsuites/tmtests/tm14/task1.c
@@ -129,7 +129,7 @@ rtems_task High_task(
     end_time,
     operation_count,
     overhead,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_URGENT
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm15/system.h b/testsuites/tmtests/tm15/system.h
index 067722db7c..efb00325e0 100644
--- a/testsuites/tmtests/tm15/system.h
+++ b/testsuites/tmtests/tm15/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c
index c3afd68e6c..6f7ecd5317 100644
--- a/testsuites/tmtests/tm15/task1.c
+++ b/testsuites/tmtests/tm15/task1.c
@@ -105,7 +105,7 @@ void test_init(void)
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_EVENT_RECEIVE
+    0
   );
 
 
@@ -126,7 +126,7 @@ void test_init(void)
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_EVENT_RECEIVE
+    0
   );
 }
 
@@ -144,7 +144,7 @@ rtems_task Low_task(
     end_time,
     OPERATION_COUNT,
     0,
-    CALLING_OVERHEAD_EVENT_RECEIVE
+    0
   );
 
   benchmark_timer_initialize();
@@ -162,7 +162,7 @@ rtems_task Low_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_EVENT_SEND
+    0
   );
 
   benchmark_timer_initialize();
@@ -179,7 +179,7 @@ rtems_task Low_task(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_EVENT_RECEIVE
+    0
   );
 
   benchmark_timer_initialize();
@@ -192,7 +192,7 @@ rtems_task Low_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_EVENT_SEND
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm16/system.h b/testsuites/tmtests/tm16/system.h
index 2ba66fc981..b7084d2ff6 100644
--- a/testsuites/tmtests/tm16/system.h
+++ b/testsuites/tmtests/tm16/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm16/task1.c b/testsuites/tmtests/tm16/task1.c
index c4aa255564..5910a18f22 100644
--- a/testsuites/tmtests/tm16/task1.c
+++ b/testsuites/tmtests/tm16/task1.c
@@ -146,7 +146,7 @@ rtems_task High_task(
     end_time,
     operation_count - 1u,
     0u,
-    CALLING_OVERHEAD_EVENT_SEND
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm17/system.h b/testsuites/tmtests/tm17/system.h
index c96a653c85..8d98f096ab 100644
--- a/testsuites/tmtests/tm17/system.h
+++ b/testsuites/tmtests/tm17/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm17/task1.c b/testsuites/tmtests/tm17/task1.c
index 15c51a1f2b..b58f8bd145 100644
--- a/testsuites/tmtests/tm17/task1.c
+++ b/testsuites/tmtests/tm17/task1.c
@@ -125,7 +125,7 @@ rtems_task Last_task(
     end_time,
     operation_count - 1u,
     overhead,
-    CALLING_OVERHEAD_TASK_SET_PRIORITY
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm18/system.h b/testsuites/tmtests/tm18/system.h
index 29a25acd03..d56e17903a 100644
--- a/testsuites/tmtests/tm18/system.h
+++ b/testsuites/tmtests/tm18/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm18/task1.c b/testsuites/tmtests/tm18/task1.c
index ca607f59f0..5db7c5da78 100644
--- a/testsuites/tmtests/tm18/task1.c
+++ b/testsuites/tmtests/tm18/task1.c
@@ -106,7 +106,7 @@ rtems_task Last_task(
     end_time,
     OPERATION_COUNT,
     0,
-    CALLING_OVERHEAD_TASK_DELETE
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm19/system.h b/testsuites/tmtests/tm19/system.h
index fcca4a6f1d..082ca80160 100644
--- a/testsuites/tmtests/tm19/system.h
+++ b/testsuites/tmtests/tm19/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm19/task1.c b/testsuites/tmtests/tm19/task1.c
index 8f07df17f5..093dc21455 100644
--- a/testsuites/tmtests/tm19/task1.c
+++ b/testsuites/tmtests/tm19/task1.c
@@ -100,7 +100,7 @@ rtems_asr Process_asr_for_pass_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_SIGNAL_SEND
+    0
   );
 
   benchmark_timer_initialize();
@@ -133,7 +133,7 @@ rtems_task Task_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_SIGNAL_CATCH
+    0
   );
 
   benchmark_timer_initialize();
@@ -145,7 +145,7 @@ rtems_task Task_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_SIGNAL_SEND
+    0
   );
 
   benchmark_timer_initialize();
diff --git a/testsuites/tmtests/tm20/system.h b/testsuites/tmtests/tm20/system.h
index 940ec7f689..c12e34dfb0 100644
--- a/testsuites/tmtests/tm20/system.h
+++ b/testsuites/tmtests/tm20/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c
index ed9c204154..cb6077d4c7 100644
--- a/testsuites/tmtests/tm20/task1.c
+++ b/testsuites/tmtests/tm20/task1.c
@@ -115,7 +115,7 @@ rtems_task Task_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_PARTITION_CREATE
+    0
   );
 
   Region_name = rtems_build_name( 'R', 'E', 'G', 'N' );
@@ -136,7 +136,7 @@ rtems_task Task_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_REGION_CREATE
+    0
   );
 
   benchmark_timer_initialize();
@@ -148,7 +148,7 @@ rtems_task Task_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_PARTITION_GET_BUFFER
+    0
   );
 
   buffer_count = 0;
@@ -175,7 +175,7 @@ rtems_task Task_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_PARTITION_GET_BUFFER
+    0
   );
 
   benchmark_timer_initialize();
@@ -187,7 +187,7 @@ rtems_task Task_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_PARTITION_RETURN_BUFFER
+    0
   );
 
   for ( index = 0 ; index < buffer_count ; index++ ) {
@@ -209,7 +209,7 @@ rtems_task Task_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_PARTITION_DELETE
+    0
   );
 
   status = rtems_region_get_segment(
@@ -236,7 +236,7 @@ rtems_task Task_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_REGION_GET_SEGMENT
+    0
   );
 
   benchmark_timer_initialize();
@@ -254,7 +254,7 @@ rtems_task Task_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_REGION_GET_SEGMENT
+    0
   );
 
   status = rtems_region_return_segment( Region_id, Buffer_address_3 );
@@ -269,7 +269,7 @@ rtems_task Task_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_REGION_RETURN_SEGMENT
+    0
   );
 
   status = rtems_region_get_segment(
@@ -299,7 +299,7 @@ rtems_task Task_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_REGION_RETURN_SEGMENT
+    0
   );
 
   status = rtems_region_return_segment( Region_id, Buffer_address_2 );
@@ -348,7 +348,7 @@ rtems_task Task_1(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_REGION_DELETE
+    0
   );
 
   benchmark_timer_initialize();
@@ -366,7 +366,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_IO_INITIALIZE
+    0
   );
 
   benchmark_timer_initialize();
@@ -379,7 +379,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_IO_OPEN
+    0
   );
 
   benchmark_timer_initialize();
@@ -392,7 +392,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_IO_CLOSE
+    0
   );
 
   benchmark_timer_initialize();
@@ -405,7 +405,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_IO_READ
+    0
   );
 
   benchmark_timer_initialize();
@@ -418,7 +418,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_IO_WRITE
+    0
   );
 
   benchmark_timer_initialize();
@@ -431,7 +431,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_IO_CONTROL
+    0
   );
 
   TEST_END();
@@ -451,7 +451,7 @@ rtems_task Task_2(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_REGION_GET_SEGMENT
+    0
   );
 
   benchmark_timer_initialize();
@@ -468,7 +468,7 @@ rtems_task Task_2(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_REGION_RETURN_SEGMENT
+    0
   );
 
   status = rtems_task_delete( RTEMS_SELF );
diff --git a/testsuites/tmtests/tm21/system.h b/testsuites/tmtests/tm21/system.h
index dc232e89e9..c31e4c1318 100644
--- a/testsuites/tmtests/tm21/system.h
+++ b/testsuites/tmtests/tm21/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c
index d7d6163d01..0b396c0841 100644
--- a/testsuites/tmtests/tm21/task1.c
+++ b/testsuites/tmtests/tm21/task1.c
@@ -139,7 +139,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TASK_IDENT
+    0
   );
 
   benchmark_timer_initialize();
@@ -152,7 +152,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_IDENT
+    0
   );
 
   benchmark_timer_initialize();
@@ -165,7 +165,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_SEMAPHORE_IDENT
+    0
   );
 
   benchmark_timer_initialize();
@@ -178,7 +178,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_PARTITION_IDENT
+    0
   );
 
   benchmark_timer_initialize();
@@ -191,7 +191,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_REGION_IDENT
+    0
   );
 
   benchmark_timer_initialize();
@@ -204,7 +204,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_PORT_IDENT
+    0
   );
 
   benchmark_timer_initialize();
@@ -217,7 +217,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TIMER_IDENT
+    0
   );
 
   benchmark_timer_initialize();
@@ -230,7 +230,7 @@ rtems_task Task_1(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_RATE_MONOTONIC_IDENT
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm22/system.h b/testsuites/tmtests/tm22/system.h
index 355c229a45..9bc2f310be 100644
--- a/testsuites/tmtests/tm22/system.h
+++ b/testsuites/tmtests/tm22/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c
index eb4548648d..2757af4b8c 100644
--- a/testsuites/tmtests/tm22/task1.c
+++ b/testsuites/tmtests/tm22/task1.c
@@ -104,7 +104,7 @@ rtems_task High_task(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_BROADCAST
+    0
   );
 
   status = rtems_task_suspend(RTEMS_SELF);
@@ -158,7 +158,7 @@ rtems_task Low_task(
     end_time,
     OPERATION_COUNT,
     1,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_BROADCAST
+    0
   );
 
   (void) rtems_message_queue_receive(
@@ -178,7 +178,7 @@ rtems_task Low_task(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_MESSAGE_QUEUE_BROADCAST
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm23/system.h b/testsuites/tmtests/tm23/system.h
index 538bb8841c..2efc856276 100644
--- a/testsuites/tmtests/tm23/system.h
+++ b/testsuites/tmtests/tm23/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c
index 249d62760a..c04f539960 100644
--- a/testsuites/tmtests/tm23/task1.c
+++ b/testsuites/tmtests/tm23/task1.c
@@ -118,7 +118,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TIMER_CREATE
+    0
   );
 
   benchmark_timer_initialize();
@@ -131,7 +131,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TIMER_FIRE_AFTER
+    0
   );
 
   benchmark_timer_initialize();
@@ -144,7 +144,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TIMER_FIRE_AFTER
+    0
   );
 
   benchmark_timer_initialize();
@@ -157,7 +157,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TIMER_CANCEL
+    0
   );
 
   for ( benchmark_timer_initialize(), i=0 ; i<OPERATION_COUNT ; i++ )
@@ -171,7 +171,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TIMER_CANCEL
+    0
   );
 
   for ( benchmark_timer_initialize(), i=0 ; i<OPERATION_COUNT ; i++ )
@@ -185,7 +185,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TIMER_RESET
+    0
   );
 
   benchmark_timer_initialize();
@@ -198,7 +198,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TIMER_RESET
+    0
   );
 
   for ( index=1 ; index <= OPERATION_COUNT ; index++ )
@@ -222,7 +222,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TIMER_FIRE_WHEN
+    0
   );
 
   benchmark_timer_initialize();
@@ -236,7 +236,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TIMER_FIRE_WHEN
+    0
   );
 
   benchmark_timer_initialize();
@@ -249,7 +249,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TIMER_DELETE
+    0
   );
 
   benchmark_timer_initialize();
@@ -274,7 +274,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TIMER_DELETE
+    0
   );
 
   benchmark_timer_initialize();
@@ -299,7 +299,7 @@ rtems_task Low_task(
     end_time,
     operation_count,
     0,
-    CALLING_OVERHEAD_TASK_WAKE_WHEN
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm24/system.h b/testsuites/tmtests/tm24/system.h
index ba8b6c6d98..8ab708e49f 100644
--- a/testsuites/tmtests/tm24/system.h
+++ b/testsuites/tmtests/tm24/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm24/task1.c b/testsuites/tmtests/tm24/task1.c
index 21de600e94..ac132ef40c 100644
--- a/testsuites/tmtests/tm24/task1.c
+++ b/testsuites/tmtests/tm24/task1.c
@@ -91,7 +91,7 @@ rtems_task High_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_TASK_WAKE_AFTER
+    0
   );
 
   Task_count = 0;
@@ -116,7 +116,7 @@ rtems_task Tasks(
       end_time,
       OPERATION_COUNT,
       overhead,
-      CALLING_OVERHEAD_TASK_WAKE_AFTER
+      0
     );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm25/system.h b/testsuites/tmtests/tm25/system.h
index dfaba09c4f..fc892ec9b7 100644
--- a/testsuites/tmtests/tm25/system.h
+++ b/testsuites/tmtests/tm25/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm25/task1.c b/testsuites/tmtests/tm25/task1.c
index 7777b51df9..c8afe71b87 100644
--- a/testsuites/tmtests/tm25/task1.c
+++ b/testsuites/tmtests/tm25/task1.c
@@ -103,7 +103,7 @@ rtems_task Low_task(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_CLOCK_TICK
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm26/system.h b/testsuites/tmtests/tm26/system.h
index 7978605349..e41afc9283 100644
--- a/testsuites/tmtests/tm26/system.h
+++ b/testsuites/tmtests/tm26/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index 9d157e9fcf..35caae095e 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -15,7 +15,6 @@
 #include <rtems.h>
 #include "system.h"
 #include "fptest.h"
-#include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
 
diff --git a/testsuites/tmtests/tm27/system.h b/testsuites/tmtests/tm27/system.h
index 83963651ec..7136afe9c1 100644
--- a/testsuites/tmtests/tm27/system.h
+++ b/testsuites/tmtests/tm27/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm28/system.h b/testsuites/tmtests/tm28/system.h
index fb9e9eb768..8ff9a6de12 100644
--- a/testsuites/tmtests/tm28/system.h
+++ b/testsuites/tmtests/tm28/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm28/task1.c b/testsuites/tmtests/tm28/task1.c
index f157209eb5..976cded38d 100644
--- a/testsuites/tmtests/tm28/task1.c
+++ b/testsuites/tmtests/tm28/task1.c
@@ -82,7 +82,7 @@ rtems_task Test_task (
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_PORT_CREATE
+    0
   );
 
   benchmark_timer_initialize();
@@ -99,7 +99,7 @@ rtems_task Test_task (
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_PORT_EXTERNAL_TO_INTERNAL
+    0
   );
 
   benchmark_timer_initialize();
@@ -116,7 +116,7 @@ rtems_task Test_task (
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_PORT_INTERNAL_TO_EXTERNAL
+    0
   );
 
   benchmark_timer_initialize();
@@ -128,7 +128,7 @@ rtems_task Test_task (
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_PORT_DELETE
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm29/system.h b/testsuites/tmtests/tm29/system.h
index c104966638..43925c1bcc 100644
--- a/testsuites/tmtests/tm29/system.h
+++ b/testsuites/tmtests/tm29/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tm29/task1.c b/testsuites/tmtests/tm29/task1.c
index ef889cbf42..e1c9aff969 100644
--- a/testsuites/tmtests/tm29/task1.c
+++ b/testsuites/tmtests/tm29/task1.c
@@ -51,7 +51,7 @@ rtems_task Init(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_RATE_MONOTONIC_CREATE
+    0
   );
 
   benchmark_timer_initialize();
@@ -63,7 +63,7 @@ rtems_task Init(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD
+    0
   );
 
   benchmark_timer_initialize();
@@ -75,7 +75,7 @@ rtems_task Init(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD
+    0
   );
 
   benchmark_timer_initialize();
@@ -87,7 +87,7 @@ rtems_task Init(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_RATE_MONOTONIC_CANCEL
+    0
   );
 
   benchmark_timer_initialize();
@@ -99,7 +99,7 @@ rtems_task Init(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_RATE_MONOTONIC_DELETE
+    0
   );
 
   status = rtems_rate_monotonic_create( Period_name, &id );
@@ -117,7 +117,7 @@ rtems_task Init(
     end_time,
     1,
     0,
-    CALLING_OVERHEAD_RATE_MONOTONIC_DELETE
+    0
   );
 
 #define LOOP_TASK_PRIORITY ((RTEMS_MAXIMUM_PRIORITY / 2u) + 1u)
@@ -203,7 +203,7 @@ rtems_task Low_task(
     end_time,
     OPERATION_COUNT,
     overhead,
-    CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD
+    0
   );
 
   TEST_END();
diff --git a/testsuites/tmtests/tm30/init.c b/testsuites/tmtests/tm30/init.c
index 309ed805c1..d35ce65d46 100644
--- a/testsuites/tmtests/tm30/init.c
+++ b/testsuites/tmtests/tm30/init.c
@@ -12,7 +12,6 @@
 #endif
 
 #include <bsp.h>
-#include <coverhd.h>
 #include <tmacros.h>
 #include <timesys.h>
 #include "test_support.h"
diff --git a/testsuites/tmtests/tmck/system.h b/testsuites/tmtests/tmck/system.h
index 9d06647d17..5366b50a3b 100644
--- a/testsuites/tmtests/tmck/system.h
+++ b/testsuites/tmtests/tmck/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */
diff --git a/testsuites/tmtests/tmoverhd/system.h b/testsuites/tmtests/tmoverhd/system.h
index f726d2e9b0..afe0fe3d10 100644
--- a/testsuites/tmtests/tmoverhd/system.h
+++ b/testsuites/tmtests/tmoverhd/system.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <coverhd.h>
 #include <tmacros.h>
 
 /* functions */