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, 16 insertions, 15 deletions

diff --git a/testsuites/tmtests/tm27/Makefile.am b/testsuites/tmtests/tm27/Makefile.am
index e69d6fa848..a15122633d 100644
--- a/testsuites/tmtests/tm27/Makefile.am
+++ b/testsuites/tmtests/tm27/Makefile.am
@@ -5,7 +5,8 @@
 MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = tm27.exe
-tm27_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm27_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm27.doc
 
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
index 108fc5364a..3794c51354 100644
--- a/testsuites/tmtests/tm27/task1.c
+++ b/testsuites/tmtests/tm27/task1.c
@@ -78,10 +78,10 @@ rtems_task Init(
   status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
   directive_failed( status, "rtems_task_start of Task_2" );
 
-  benchmark_timerinitialize();
-  benchmark_timerread();
-  benchmark_timerinitialize();
-  timer_overhead = benchmark_timerread();
+  benchmark_timer_initialize();
+  benchmark_timer_read();
+  benchmark_timer_initialize();
+  timer_overhead = benchmark_timer_read();
 
   status = rtems_task_delete( RTEMS_SELF );
   directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
@@ -103,14 +103,14 @@ rtems_task Task_1(
 
   Interrupt_occurred = 0;
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
   Cause_tm27_intr();
   /* goes to Isr_handler */
 
 #if (MUST_WAIT_FOR_INTERRUPT == 1)
   while ( Interrupt_occurred == 0 );
 #endif
-  Interrupt_return_time = benchmark_timerread();
+  Interrupt_return_time = benchmark_timer_read();
 
   put_time(
     "interrupt entry overhead: returns to interrupted task",
@@ -137,14 +137,14 @@ rtems_task Task_1(
   Interrupt_nest = 1;
 
   Interrupt_occurred = 0;
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
   Cause_tm27_intr();
   /* goes to Isr_handler */
 
 #if (MUST_WAIT_FOR_INTERRUPT == 1)
   while ( Interrupt_occurred == 0 );
 #endif
-  Interrupt_return_time = benchmark_timerread();
+  Interrupt_return_time = benchmark_timer_read();
 
   _Thread_Dispatch_disable_level = 0;
 
@@ -175,7 +175,7 @@ rtems_task Task_1(
   _Context_Switch_necessary = 1;
 
   Interrupt_occurred = 0;
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
   Cause_tm27_intr();
 
   /*
@@ -201,7 +201,7 @@ rtems_task Task_2(
 #if (MUST_WAIT_FOR_INTERRUPT == 1)
   while ( Interrupt_occurred == 0 );
 #endif
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "interrupt entry overhead: returns to preempting task",
@@ -246,7 +246,7 @@ rtems_isr Isr_handler(
   rtems_vector_number vector
 )
 {
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   Interrupt_occurred = 1;
   Isr_handler_inner();
@@ -266,18 +266,18 @@ void Isr_handler_inner( void )
       Interrupt_nest = 2;
       Interrupt_occurred = 0;
       Lower_tm27_intr();
-      benchmark_timerinitialize();
+      benchmark_timer_initialize();
       Cause_tm27_intr();
       /* goes to a nested copy of Isr_handler */
 #if (MUST_WAIT_FOR_INTERRUPT == 1)
        while ( Interrupt_occurred == 0 );
 #endif
-      Interrupt_return_nested_time = benchmark_timerread();
+      Interrupt_return_nested_time = benchmark_timer_read();
       break;
     case 2:
       Interrupt_enter_nested_time = end_time;
       break;
   }
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
 }