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

	* console/console.c, include/m340timer.h, timer/timer.c: Rename timer
	driver methods to follow RTEMS programming conventions.

4 files changed, 17 insertions, 12 deletions

diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
index 4e8799e594..14f8a97d66 100644
--- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-31	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* console/console.c, include/m340timer.h, timer/timer.c: Rename timer
+	driver methods to follow RTEMS programming conventions.
+
 2008-08-19	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* timer/timer.c: Add missing prototypes.
diff --git a/c/src/lib/libbsp/m68k/gen68340/console/console.c b/c/src/lib/libbsp/m68k/gen68340/console/console.c
index 48a21be0b7..6c37e4438e 100644
--- a/c/src/lib/libbsp/m68k/gen68340/console/console.c
+++ b/c/src/lib/libbsp/m68k/gen68340/console/console.c
@@ -553,7 +553,7 @@ rtems_device_driver console_initialize(
 	 */
         Init_UART_Table();
 	dbugInitialise ();
-	Fifo_Full_Timer_initialize();
+	Fifo_Full_benchmark_timerinitialize();
 
 	/*
 	 * Register the devices
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h b/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h
index b829a23b17..cc503ba9bf 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h
+++ b/c/src/lib/libbsp/m68k/gen68340/include/m340timer.h
@@ -25,7 +25,7 @@
 #ifndef __m340timer_H__
 #define __m340timer_H__
 
-extern void Fifo_Full_Timer_initialize (void);
+extern void Fifo_Full_benchmark_timerinitialize (void);
 
 extern void (*Restart_Fifo_Full_A_Timer)();
 extern void (*Restart_Check_A_Timer)();
diff --git a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c
index 0bfd272cd5..6ab478e2b6 100644
--- a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c
@@ -113,12 +113,12 @@ void __do_nothing (void)
 #define Fifo_Full_on_B (m340_uart_config[UART_CHANNEL_B].rx_mode==UART_FIFO_FULL && m340_uart_config[UART_CHANNEL_B].enable && m340_uart_config[UART_CHANNEL_B].mode==UART_INTERRUPTS)
 
 /******************************************************
-  Name: Fifo_Full_Timer_initialize
+  Name: Fifo_Full_benchmark_timerinitialize
   Input parameters: -
   Output parameters: -
   Description: initialize Timer 1 for FIFO full mode
  *****************************************************/
-void Fifo_Full_Timer_initialize (void)
+void Fifo_Full_benchmark_timerinitialize (void)
 {
    float max_baud_rate;
    int prescaler_output_tap = -1;
@@ -218,12 +218,12 @@ void Fifo_Full_Timer_initialize (void)
 }
 
 /******************************************************
-  Name: Timer_initialize
+  Name: benchmark_timerinitialize
   Input parameters: -
   Output parameters: -
   Description: init Timer for timing test suites
  *****************************************************/
-void Timer_initialize (void)
+void benchmark_timerinitialize (void)
 {
 	/* Disable the timer */
 	TCR2 &= ~m340_SWR;
@@ -250,20 +250,20 @@ void Timer_initialize (void)
 }
 
 /******************************************************
-  Name: Read_timer
+  Name: benchmark_timerread
   Input parameters: -
   Output parameters: -
   Description: Return timer value in microsecond units
  *****************************************************/
 int
-Read_timer (void)
+benchmark_timerread (void)
 {
  /* there's CLOCK_SPEED / 16 micro seconds between two timer register decrement */
  return (((0xFFFF - TCNTR2) * CLOCK_SPEED) / 16);
 }
 
 /******************************************************
-  Name: Empty_function
+  Name: benchmark_timerempty_function
   Input parameters: -
   Output parameters: -
   Description: Empty function call used in loops to
@@ -271,18 +271,18 @@ Read_timer (void)
                in Timing Test Suite.
  *****************************************************/
 rtems_status_code
-Empty_function (void)
+benchmark_timerempty_function (void)
 {
 	return RTEMS_SUCCESSFUL;
 }
 
 /******************************************************
-  Name: Set_find_average_overhead
+  Name: benchmark_timerdisable_subtracting_average_overhead
   Input parameters: -
   Output parameters: -
   Description: -
  *****************************************************/
 void
-Set_find_average_overhead(rtems_boolean find_flag)
+benchmark_timerdisable_subtracting_average_overhead(rtems_boolean find_flag)
 {
 }