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, 19 insertions, 18 deletions

diff --git a/testsuites/tmtests/tmck/Makefile.am b/testsuites/tmtests/tmck/Makefile.am
index 8bf7bff28a..ffbb9d0f35 100644
--- a/testsuites/tmtests/tmck/Makefile.am
+++ b/testsuites/tmtests/tmck/Makefile.am
@@ -5,7 +5,8 @@
 MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = tmck.exe
-tmck_exe_SOURCES = task1.c system.h ../include/timesys.h
+tmck_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tmck.doc
 
diff --git a/testsuites/tmtests/tmck/task1.c b/testsuites/tmtests/tmck/task1.c
index 4457c264de..9e46732f4f 100644
--- a/testsuites/tmtests/tmck/task1.c
+++ b/testsuites/tmtests/tmck/task1.c
@@ -38,7 +38,7 @@ rtems_task Init(
    *  Tell the Timer Driver what we are doing
    */
 
-  benchmark_timerdisable_subtracting_average_overhead( 1 );
+  benchmark_timer_disable_subtracting_average_overhead( 1 );
 
   Print_Warning();
 
@@ -72,8 +72,8 @@ rtems_task Task_1(
   check_read_timer();
 rtems_test_pause();
 
-  benchmark_timerinitialize();
-  end_time = benchmark_timerread();
+  benchmark_timer_initialize();
+  end_time = benchmark_timer_read();
 
   put_time(
     "NULL timer stopped at",
@@ -83,10 +83,10 @@ rtems_test_pause();
     0
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
   for ( index = 1 ; index <= 1000 ; index++ )
-    (void) benchmark_timerempty_function();
-  end_time = benchmark_timerread();
+    (void) benchmark_timer_empty_function();
+  end_time = benchmark_timer_read();
 
   put_time(
     "LOOP (1000) timer stopped at",
@@ -96,10 +96,10 @@ rtems_test_pause();
     0
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
   for ( index = 1 ; index <= 10000 ; index++ )
-    (void) benchmark_timerempty_function();
-  end_time = benchmark_timerread();
+    (void) benchmark_timer_empty_function();
+  end_time = benchmark_timer_read();
 
   put_time(
     "LOOP (10000) timer stopped at",
@@ -109,10 +109,10 @@ rtems_test_pause();
     0
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
   for ( index = 1 ; index <= 50000 ; index++ )
-    (void) benchmark_timerempty_function();
-  end_time = benchmark_timerread();
+    (void) benchmark_timer_empty_function();
+  end_time = benchmark_timer_read();
 
   put_time(
     "LOOP (50000) timer stopped at",
@@ -122,10 +122,10 @@ rtems_test_pause();
     0
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
   for ( index = 1 ; index <= 100000 ; index++ )
-    (void) benchmark_timerempty_function();
-  end_time = benchmark_timerread();
+    (void) benchmark_timer_empty_function();
+  end_time = benchmark_timer_read();
 
   put_time(
     "LOOP (100000) timer stopped at",
@@ -148,8 +148,8 @@ void check_read_timer()
     Distribution[ index ] = 0;
 
   for ( index = 1 ; index <= OPERATION_COUNT ; index++ ) {
-    benchmark_timerinitialize();
-    end_time = benchmark_timerread();
+    benchmark_timer_initialize();
+    end_time = benchmark_timer_read();
     if ( end_time > MAXIMUM_DISTRIBUTION ) {
       /*
        *  Under UNIX a simple process swap takes longer than we