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

	* tm01/Makefile.am, tm01/task1.c, tm02/Makefile.am, tm02/task1.c,
	tm03/Makefile.am, tm03/task1.c, tm04/Makefile.am, tm04/task1.c,
	tm05/Makefile.am, tm05/task1.c, tm06/Makefile.am, tm06/task1.c,
	tm07/Makefile.am, tm07/task1.c, tm08/Makefile.am, tm08/task1.c,
	tm09/Makefile.am, tm09/task1.c, tm10/Makefile.am, tm10/task1.c,
	tm11/Makefile.am, tm11/task1.c, tm12/Makefile.am, tm12/task1.c,
	tm13/Makefile.am, tm13/task1.c, tm14/Makefile.am, tm14/task1.c,
	tm15/Makefile.am, tm15/task1.c, tm16/Makefile.am, tm16/task1.c,
	tm17/Makefile.am, tm17/task1.c, tm18/Makefile.am, tm18/task1.c,
	tm19/Makefile.am, tm19/task1.c, tm20/Makefile.am, tm20/task1.c,
	tm21/Makefile.am, tm21/task1.c, tm22/Makefile.am, tm22/task1.c,
	tm23/Makefile.am, tm23/task1.c, tm24/Makefile.am, tm24/task1.c,
	tm25/Makefile.am, tm25/task1.c, tm26/Makefile.am, tm26/task1.c,
	tm27/Makefile.am, tm27/task1.c, tm28/Makefile.am, tm28/task1.c,
	tm29/Makefile.am, tm29/task1.c, tmck/Makefile.am, tmck/task1.c,
	tmoverhd/Makefile.am, tmoverhd/testtask.c: Eliminate empty function
	from every benchmark timer driver. Fix spelling.

2 files changed, 35 insertions, 34 deletions

diff --git a/testsuites/tmtests/tm23/Makefile.am b/testsuites/tmtests/tm23/Makefile.am
index bb388a81c1..368379f268 100644
--- a/testsuites/tmtests/tm23/Makefile.am
+++ b/testsuites/tmtests/tm23/Makefile.am
@@ -5,7 +5,8 @@
 MANAGERS = io event timer semaphore
 
 rtems_tests_PROGRAMS = tm23.exe
-tm23_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm23_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm23.doc
 
diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c
index b33769d175..cc10abb987 100644
--- a/testsuites/tmtests/tm23/task1.c
+++ b/testsuites/tmtests/tm23/task1.c
@@ -50,10 +50,10 @@ rtems_task Init(
 
   puts( "\n\n*** TIME TEST 23 ***" );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
   priority = 5;
 
@@ -97,15 +97,15 @@ rtems_task High_task(
   rtems_status_code status;
   int i;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) benchmark_timerempty_function();
-  overhead = benchmark_timerread();
+      (void) benchmark_timer_empty_function();
+  overhead = benchmark_timer_read();
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_create( index, &Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_create",
@@ -115,10 +115,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_CREATE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_fire_after( Timer_id[ index ], 500, null_delay, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_fire_after: inactive",
@@ -128,10 +128,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_FIRE_AFTER
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_fire_after( Timer_id[ index ], 500, null_delay, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_fire_after: active",
@@ -141,10 +141,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_FIRE_AFTER
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_cancel( Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_cancel: active",
@@ -154,11 +154,11 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_CANCEL
   );
 
-  for ( benchmark_timerinitialize(), i=0 ; i<OPERATION_COUNT ; i++ )
-  benchmark_timerinitialize();
+  for ( benchmark_timer_initialize(), i=0 ; i<OPERATION_COUNT ; i++ )
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_cancel( Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_cancel: inactive",
@@ -168,11 +168,11 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_CANCEL
   );
 
-  for ( benchmark_timerinitialize(), i=0 ; i<OPERATION_COUNT ; i++ )
-  benchmark_timerinitialize();
+  for ( benchmark_timer_initialize(), i=0 ; i<OPERATION_COUNT ; i++ )
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_reset( Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_reset: inactive",
@@ -182,10 +182,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_RESET
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_reset( Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_reset: active",
@@ -205,11 +205,11 @@ rtems_task High_task(
 
   time_of_day.year = 1989;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_fire_when(
          Timer_id[ index ], &time_of_day, null_delay, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_fire_when: inactive",
@@ -219,11 +219,11 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_FIRE_WHEN
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_fire_when(
          Timer_id[ index ], &time_of_day, null_delay, NULL );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_fire_when: active",
@@ -233,10 +233,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_FIRE_WHEN
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_delete( Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_delete: active",
@@ -246,7 +246,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_DELETE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
   for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
     status = rtems_timer_create( index, &Timer_id[ index ] );
     directive_failed( status, "rtems_timer_create" );
@@ -258,10 +258,10 @@ rtems_task High_task(
     directive_failed( status, "rtems_timer_cancel" );
   }
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_delete( Timer_id[ index ] );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_timer_delete: inactive",
@@ -271,7 +271,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_DELETE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void) rtems_task_wake_when( &time_of_day );
 }
 
@@ -286,7 +286,7 @@ rtems_task Low_task(
   rtems_task_argument argument
 )
 {
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_wake_when",