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, 41 insertions, 41 deletions

diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c
index 63a5f9ce94..1a33032d66 100644
--- a/testsuites/tmtests/tm20/task1.c
+++ b/testsuites/tmtests/tm20/task1.c
@@ -97,7 +97,7 @@ rtems_task Task_1(
 
   Partition_name = rtems_build_name( 'P', 'A', 'R', 'T' );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     rtems_partition_create(
       Partition_name,
       Partition_area,
@@ -106,7 +106,7 @@ rtems_task Task_1(
       RTEMS_DEFAULT_ATTRIBUTES,
       &Partition_id
     );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_partition_create",
@@ -118,7 +118,7 @@ rtems_task Task_1(
 
   Region_name = rtems_build_name( 'R', 'E', 'G', 'N' );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     rtems_region_create(
       Region_name,
       Region_area,
@@ -127,7 +127,7 @@ rtems_task Task_1(
       RTEMS_DEFAULT_ATTRIBUTES,
       &Region_id
     );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_create",
@@ -137,9 +137,9 @@ rtems_task Task_1(
     CALLING_OVERHEAD_REGION_CREATE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_partition_get_buffer( Partition_id, &Buffer_address_1 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_partition_get_buffer: available",
@@ -164,9 +164,9 @@ rtems_task Task_1(
     assert( buffer_count < PARTITION_BUFFER_POINTERS );
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_partition_get_buffer( Partition_id, &Buffer_address_2 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_partition_get_buffer: not available",
@@ -176,9 +176,9 @@ rtems_task Task_1(
     CALLING_OVERHEAD_PARTITION_GET_BUFFER
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_partition_return_buffer( Partition_id, Buffer_address_1 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_partition_return_buffer",
@@ -198,9 +198,9 @@ rtems_task Task_1(
 
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_partition_delete( Partition_id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_partition_delete",
@@ -219,7 +219,7 @@ rtems_task Task_1(
            );
   directive_failed( status, "region_get_segment" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_get_segment(
       Region_id,
       400,
@@ -227,7 +227,7 @@ rtems_task Task_1(
       RTEMS_NO_TIMEOUT,
       &Buffer_address_3
     );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_get_segment: available",
@@ -237,7 +237,7 @@ rtems_task Task_1(
     CALLING_OVERHEAD_REGION_GET_SEGMENT
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_get_segment(
       Region_id,
       1998,
@@ -245,7 +245,7 @@ rtems_task Task_1(
       RTEMS_NO_TIMEOUT,
       &Buffer_address_4
     );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_get_segment: not available -- NO_WAIT",
@@ -258,9 +258,9 @@ rtems_task Task_1(
   status = rtems_region_return_segment( Region_id, Buffer_address_3 );
   directive_failed( status, "rtems_region_return_segment" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_return_segment( Region_id, Buffer_address_2 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_return_segment: no waiting tasks",
@@ -279,7 +279,7 @@ rtems_task Task_1(
   );
   directive_failed( status, "rtems_region_get_segment" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_get_segment(
       Region_id,
       1998,
@@ -290,7 +290,7 @@ rtems_task Task_1(
 
   /* execute Task_2 */
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_return_segment: task readied -- preempts caller",
@@ -336,9 +336,9 @@ rtems_task Task_1(
   status = rtems_region_return_segment( Region_id, Buffer_address_2 );
   directive_failed( status, "rtems_region_return_segment" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_delete( Region_id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_delete",
@@ -348,15 +348,15 @@ rtems_task Task_1(
     CALLING_OVERHEAD_REGION_DELETE
   );
 
-  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_io_initialize( _STUB_major, 0, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_io_initialize",
@@ -366,10 +366,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_INITIALIZE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_open( _STUB_major, 0, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_io_open",
@@ -379,10 +379,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_OPEN
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_close( _STUB_major, 0, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_io_close",
@@ -392,10 +392,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_CLOSE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_read( _STUB_major, 0, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_io_read",
@@ -405,10 +405,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_READ
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_write( _STUB_major, 0, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_io_write",
@@ -418,10 +418,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_WRITE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_control( _STUB_major, 0, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_io_control",
@@ -441,7 +441,7 @@ rtems_task Task_2(
 {
   rtems_status_code status;
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_get_segment: not available -- caller blocks",
@@ -451,14 +451,14 @@ rtems_task Task_2(
     CALLING_OVERHEAD_REGION_GET_SEGMENT
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_return_segment( Region_id, Buffer_address_1 );
 
   /* preempt back to Task_1 */
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_return_segment( Region_id, Buffer_address_1 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_return_segment: task readied -- returns to caller",