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, 25 insertions, 24 deletions

diff --git a/testsuites/tmtests/tm08/Makefile.am b/testsuites/tmtests/tm08/Makefile.am
index 590b409ba4..bf0876714c 100644
--- a/testsuites/tmtests/tm08/Makefile.am
+++ b/testsuites/tmtests/tm08/Makefile.am
@@ -5,7 +5,8 @@
 MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = tm08.exe
-tm08_exe_SOURCES = task1.c system.h ../include/timesys.h
+tm08_exe_SOURCES = task1.c system.h ../include/timesys.h \
+    ../../support/src/tmtests_empty_function.c
 
 dist_rtems_tests_DATA = tm08.doc
 
diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c
index f5dbe383a9..13f1047d24 100644
--- a/testsuites/tmtests/tm08/task1.c
+++ b/testsuites/tmtests/tm08/task1.c
@@ -81,19 +81,19 @@ rtems_task test_task(
   uint32_t      old_note;
   uint32_t      old_mode;
 
-  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_task_set_priority(
                Test_task_id,
                RTEMS_CURRENT_PRIORITY,
                &old_priority
              );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_set_priority: obtain current priority",
@@ -103,10 +103,10 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_SET_PRIORITY
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_set_priority( Test_task_id, 253, &old_priority );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_set_priority: returns to caller",
@@ -116,14 +116,14 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_SET_PRIORITY
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_mode(
         RTEMS_CURRENT_MODE,
         RTEMS_CURRENT_MODE,
         &old_mode
       );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_mode: obtain current mode",
@@ -133,7 +133,7 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_MODE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
       (void) rtems_task_mode(
         RTEMS_INTERRUPT_LEVEL(1),
@@ -146,7 +146,7 @@ rtems_task test_task(
         &old_mode
       );
     }
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_mode: no reschedule",
@@ -156,9 +156,9 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_MODE
   );
 
-  benchmark_timerinitialize();                 /* must be one host */
+  benchmark_timer_initialize();                 /* must be one host */
     (void) rtems_task_mode( RTEMS_NO_ASR, RTEMS_ASR_MASK, &old_mode );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_mode: reschedule -- returns to caller",
@@ -175,13 +175,13 @@ rtems_task test_task(
   directive_failed( status, "rtems_task_set_priority" );
 
   /* preempted by test_task1 */
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     (void)  rtems_task_mode( RTEMS_PREEMPT, RTEMS_PREEMPT_MASK, &old_mode );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_set_note( Test_task_id, 8, 10 );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_set_note",
@@ -191,10 +191,10 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_SET_NOTE
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_get_note( Test_task_id, 8, &old_note );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_get_note",
@@ -206,10 +206,10 @@ rtems_task test_task(
 
   build_time( &time, 1, 1, 1988, 0, 0, 0, 0 );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_clock_set( &time );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_clock_set",
@@ -219,10 +219,10 @@ rtems_task test_task(
     CALLING_OVERHEAD_CLOCK_SET
   );
 
-  benchmark_timerinitialize();
+  benchmark_timer_initialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_clock_get",
@@ -240,7 +240,7 @@ rtems_task test_task1(
   rtems_task_argument argument
 )
 {
-  end_time = benchmark_timerread();
+  end_time = benchmark_timer_read();
 
   put_time(
     "rtems_task_mode: reschedule -- preempts caller",