2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>

	* tm01/task1.c, tm02/task1.c, tm03/task1.c, tm04/task1.c, tm05/task1.c,
	tm06/task1.c, tm07/task1.c, tm08/task1.c, tm09/task1.c, tm10/task1.c,
	tm11/task1.c, tm12/task1.c, tm13/task1.c, tm14/task1.c, tm15/task1.c,
	tm16/task1.c, tm17/task1.c, tm18/task1.c, tm19/task1.c, tm20/task1.c,
	tm21/task1.c, tm22/task1.c, tm23/task1.c, tm24/task1.c, tm25/task1.c,
	tm26/task1.c, tm27/task1.c, tm28/task1.c, tm29/task1.c, tmck/task1.c,
	tmoverhd/testtask.c: Rename timer driver methods to follow RTEMS
	programming conventions.

1 files changed, 18 insertions, 18 deletions

diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c
index f80f12e7da..e4693271c9 100644
--- a/testsuites/tmtests/tm15/task1.c
+++ b/testsuites/tmtests/tm15/task1.c
@@ -78,12 +78,12 @@ void test_init()
     directive_failed( status, "rtems_task_start LOOP" );
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
     {
         (void) rtems_event_receive(
@@ -94,7 +94,7 @@ void test_init()
                );
     }
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_event_receive: obtain current events",
@@ -105,7 +105,7 @@ void test_init()
   );
 
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
     {
       (void) rtems_event_receive(
@@ -115,7 +115,7 @@ void test_init()
                &event_out
              );
     }
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_event_receive: not available -- NO_WAIT",
@@ -133,7 +133,7 @@ rtems_task Low_task(
   uint32_t    index;
   rtems_event_set   event_out;
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_event_receive: not available -- caller blocks",
@@ -143,15 +143,15 @@ rtems_task Low_task(
     CALLING_OVERHEAD_EVENT_RECEIVE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_event_send( RTEMS_SELF, RTEMS_EVENT_16 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_event_send: no task readied",
@@ -161,14 +161,14 @@ rtems_task Low_task(
     CALLING_OVERHEAD_EVENT_SEND
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_event_receive(
              RTEMS_EVENT_16,
              RTEMS_DEFAULT_OPTIONS,
              RTEMS_NO_TIMEOUT,
              &event_out
            );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_event_receive: available",
@@ -178,10 +178,10 @@ rtems_task Low_task(
     CALLING_OVERHEAD_EVENT_RECEIVE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_event_send( Task_id[ index ], RTEMS_EVENT_16 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_event_send: task readied -- returns to caller",
@@ -210,7 +210,7 @@ rtems_task High_tasks(
     );
   else {
     time_set = 1;
-    Timer_initialize();            /* start blocking rtems_event_receive time */
+    benchmark_timerinitialize();            /* start blocking rtems_event_receive time */
     status = rtems_event_receive(
       RTEMS_EVENT_16,
       RTEMS_DEFAULT_OPTIONS,