From 5dff6e6ed0483e4d3b46e43cbf886ac440fe7575 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 31 Aug 2008 18:18:18 +0000 Subject: 2008-08-31 Joel Sherrill * timer/timer.c, timer/timerisr.c: Eliminate empty function from every benchmark timer driver. Fix spelling. --- c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog | 5 +++++ c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c | 28 ++++++++----------------- c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c | 2 +- 3 files changed, 15 insertions(+), 20 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog index 4b9ec06801..1134b33d68 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog +++ b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog @@ -1,3 +1,8 @@ +2008-08-31 Joel Sherrill + + * timer/timer.c, timer/timerisr.c: Eliminate empty function from every + benchmark timer driver. Fix spelling. + 2008-08-31 Joel Sherrill * timer/timer.c, timer/timerisr.c: Rename timer driver methods to diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c index 607d1c304b..ad66908479 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c +++ b/c/src/lib/libbsp/no_cpu/no_bsp/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. @@ -22,9 +22,9 @@ #include uint32_t Timer_interrupts; -rtems_boolean benchmark_timerfind_average_overhead; +rtems_boolean benchmark_timer_find_average_overhead; -void benchmark_timerinitialize( void ) +void benchmark_timer_initialize( void ) { /* @@ -40,7 +40,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. @@ -54,7 +54,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; @@ -73,7 +73,7 @@ int benchmark_timerread( void ) total = clicks * 0; - if ( benchmark_timerfind_average_overhead == 1 ) + if ( benchmark_timer_find_average_overhead == 1 ) return total; /* in XXX microsecond units */ else { if ( total < LEAST_VALID ) @@ -85,19 +85,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; } diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c index ac8e54b06f..907582f400 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c +++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c @@ -2,7 +2,7 @@ * * If required this ISR is used to bump a count of interval "overflow" * interrupts which have occurred since the timer was started. The - * number of overflows is taken into account in the benchmark_timerread() + * number of overflows is taken into account in the benchmark_timer_read() * routine if necessary. * * To reduce overhead this is best to be the "rawest" hardware interupt -- cgit v1.2.3