From 722ab6dd0396d11c216bfefd26d0fc908951b09f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 31 Aug 2008 18:15:27 +0000 Subject: 2008-08-31 Joel Sherrill * console/console.c, include/m340timer.h, timer/timer.c: Eliminate empty function from every benchmark timer driver. Fix spelling. --- c/src/lib/libbsp/m68k/gen68340/ChangeLog | 5 ++++ c/src/lib/libbsp/m68k/gen68340/console/console.c | 2 +- c/src/lib/libbsp/m68k/gen68340/include/m340timer.h | 2 +- c/src/lib/libbsp/m68k/gen68340/timer/timer.c | 30 ++++++---------------- 4 files changed, 15 insertions(+), 24 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index 14f8a97d66..62bf88a0db 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 + + * console/console.c, include/m340timer.h, timer/timer.c: Eliminate + empty function from every benchmark timer driver. Fix spelling. + 2008-08-31 Joel Sherrill * console/console.c, include/m340timer.h, timer/timer.c: Rename timer diff --git a/c/src/lib/libbsp/m68k/gen68340/console/console.c b/c/src/lib/libbsp/m68k/gen68340/console/console.c index 6c37e4438e..5df513e724 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_benchmark_timerinitialize(); + Fifo_Full_benchmark_timer_initialize(); /* * 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 cc503ba9bf..83214c0c04 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_benchmark_timerinitialize (void); +extern void Fifo_Full_benchmark_timer_initialize (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 6ab478e2b6..f2511dd6a4 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_benchmark_timerinitialize + Name: Fifo_Full_benchmark_timer_initialize Input parameters: - Output parameters: - Description: initialize Timer 1 for FIFO full mode *****************************************************/ -void Fifo_Full_benchmark_timerinitialize (void) +void Fifo_Full_benchmark_timer_initialize (void) { float max_baud_rate; int prescaler_output_tap = -1; @@ -218,12 +218,12 @@ void Fifo_Full_benchmark_timerinitialize (void) } /****************************************************** - Name: benchmark_timerinitialize + Name: benchmark_timer_initialize Input parameters: - Output parameters: - Description: init Timer for timing test suites *****************************************************/ -void benchmark_timerinitialize (void) +void benchmark_timer_initialize (void) { /* Disable the timer */ TCR2 &= ~m340_SWR; @@ -250,39 +250,25 @@ void benchmark_timerinitialize (void) } /****************************************************** - Name: benchmark_timerread + Name: benchmark_timer_read Input parameters: - Output parameters: - Description: Return timer value in microsecond units *****************************************************/ int -benchmark_timerread (void) +benchmark_timer_read (void) { /* there's CLOCK_SPEED / 16 micro seconds between two timer register decrement */ return (((0xFFFF - TCNTR2) * CLOCK_SPEED) / 16); } /****************************************************** - Name: benchmark_timerempty_function - Input parameters: - - Output parameters: - - Description: 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; -} - -/****************************************************** - Name: benchmark_timerdisable_subtracting_average_overhead + Name: benchmark_timer_disable_subtracting_average_overhead Input parameters: - Output parameters: - Description: - *****************************************************/ void -benchmark_timerdisable_subtracting_average_overhead(rtems_boolean find_flag) +benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag) { } -- cgit v1.2.3