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

	* timer/timer.c: Eliminate empty function from every benchmark timer
	driver. Fix spelling.

2 files changed, 14 insertions, 19 deletions

diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
index 56041647b1..e370394074 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
+++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
@@ -1,5 +1,10 @@
 2008-08-31	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* timer/timer.c: Eliminate empty function from every benchmark timer
+	driver. Fix spelling.
+
+2008-08-31	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* timer/timer.c: Rename timer driver methods to follow RTEMS
 	programming conventions.
 
diff --git a/c/src/lib/libbsp/c4x/c4xsim/timer/timer.c b/c/src/lib/libbsp/c4x/c4xsim/timer/timer.c
index ceab1582cb..999cd6a2a3 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/timer/timer.c
+++ b/c/src/lib/libbsp/c4x/c4xsim/timer/timer.c
@@ -2,8 +2,8 @@
  *
  *  This file manages the benchmark timer used by the RTEMS Timing Test
  *  Suite.  Each measured time period is demarcated by calls to
- *  benchmark_timerinitialize() and benchmark_timerread().  benchmark_timerread() usually returns
- *  the number of microseconds since benchmark_timerinitialize() exitted.
+ *  benchmark_timer_initialize() and benchmark_timer_read().  benchmark_timer_read() usually returns
+ *  the number of microseconds since benchmark_timer_initialize() exitted.
  *
  *  NOTE: It is important that the timer start/stop overhead be
  *        determined when porting or modifying this code.
@@ -23,11 +23,11 @@
 #include <rtems/tic4x/c4xio.h>
 
 uint32_t         Timer_interrupts;
-rtems_boolean benchmark_timerfind_average_overhead;
+rtems_boolean benchmark_timer_find_average_overhead;
 
 static uint32_t   start;
 
-void benchmark_timerinitialize( void )
+void benchmark_timer_initialize( void )
 {
 
   /*
@@ -48,7 +48,7 @@ void benchmark_timerinitialize( void )
 }
 
 /*
- *  The following controls the behavior of benchmark_timerread().
+ *  The following controls the behavior of benchmark_timer_read().
  *
  *  AVG_OVEREHAD is the overhead for starting and stopping the timer.  It
  *  is usually deducted from the number returned.
@@ -62,7 +62,7 @@ void benchmark_timerinitialize( void )
                              /* This value is in microseconds. */
 #define LEAST_VALID       1  /* Don't trust a clicks value lower than this */
 
-int benchmark_timerread( void )
+int benchmark_timer_read( void )
 {
   uint32_t         clicks;
   uint32_t         total;
@@ -83,7 +83,7 @@ int benchmark_timerread( void )
 
   total = clicks * 1;
 
-  if ( benchmark_timerfind_average_overhead == 1 ) {
+  if ( benchmark_timer_find_average_overhead == 1 ) {
     return total;          /* in count units where each count is */
                            /* 1 / (clock frequency/2) */
   } else {
@@ -97,19 +97,9 @@ int benchmark_timerread( void )
     }
 }
 
-/*
- *  Empty function call used in loops to measure basic cost of looping
- *  in Timing Test Suite.
- */
-
-rtems_status_code benchmark_timerempty_function( void )
-{
-  return RTEMS_SUCCESSFUL;
-}
-
-void benchmark_timerdisable_subtracting_average_overhead(
+void benchmark_timer_disable_subtracting_average_overhead(
   rtems_boolean find_flag
 )
 {
-  benchmark_timerfind_average_overhead = find_flag;
+  benchmark_timer_find_average_overhead = find_flag;
 }