From 674a980f1c382d125a34e320bcb44771dd027628 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 31 Aug 2008 16:38:22 +0000 Subject: 2008-08-31 Joel Sherrill * timer/timer.c, timer/timerisr.S: Rename timer driver methods to follow RTEMS programming conventions. --- c/src/lib/libbsp/m68k/mvme167/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/mvme167/timer/timer.c | 22 +++++++++++----------- c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S | 2 +- c/src/lib/libbsp/m68k/ods68302/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/ods68302/timer/timer.c | 16 ++++++++-------- c/src/lib/libbsp/m68k/ods68302/timer/timerisr.S | 2 +- 6 files changed, 31 insertions(+), 21 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index f1ffd752c4..cfc0896cd6 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog @@ -1,3 +1,8 @@ +2008-08-31 Joel Sherrill + + * timer/timer.c, timer/timerisr.S: Rename timer driver methods to + follow RTEMS programming conventions. + 2008-08-19 Ralf Corsépius * timer/timer.c: Add missing prototypes. diff --git a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c index 740fb2efe2..5e86243763 100644 --- a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c @@ -1,9 +1,9 @@ /* timer.c * * This file manages the benchmark timer used by the RTEMS Timing Test Suite. - * Each measured time period is demarcated by calls to Timer_initialize() and - * Read_timer(). Read_timer() usually returns the number of microseconds - * since Timer_initialize() exitted. + * 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. * * These functions are prototyped in rtems/c/src/lib/include/timerdrv.h and * must be implemented as part of the BSP. @@ -46,7 +46,7 @@ uint32_t Ttimer_val; * in the .bss section and on that section being explicitly zeroed at boot * time. */ -rtems_boolean Timer_driver_Find_average_overhead; +rtems_boolean benchmark_timerfind_average_overhead; rtems_isr timerisr(void); @@ -70,7 +70,7 @@ rtems_isr timerisr(void); * boot ROM to provide a 1 MHz clock to the timers. For a 25 MHz MVME167, the * prescaler value should be 0xE7 (page 2-63). */ -void Timer_initialize(void) +void benchmark_timerinitialize(void) { (void) set_vector( timerisr, TIMER_VECTOR, 0 ); @@ -105,13 +105,13 @@ void Timer_initialize(void) * LEAST_VALID is the lowest number this routine should trust. Numbers * below this are "noise" and zero is returned. */ -int Read_timer(void) +int benchmark_timerread(void) { uint32_t total; total = (Ttimer_val * TICK_INTERVAL) + lcsr->timer_cnt_1; - if ( Timer_driver_Find_average_overhead ) + if ( benchmark_timerfind_average_overhead ) return total; /* in one microsecond units */ if ( total < LEAST_VALID ) @@ -128,22 +128,22 @@ int Read_timer(void) * * Output parameters: time in microseconds */ -rtems_status_code Empty_function( void ) +rtems_status_code benchmark_timerempty_function( void ) { return RTEMS_SUCCESSFUL; } /* - * This routine sets the Timer_driver_Find_average_overhead flag in this + * This routine sets the benchmark_timerfind_average_overhead flag in this * module. * * Input parameters: NONE * * Output parameters: time in microseconds */ -void Set_find_average_overhead( +void benchmark_timerdisable_subtracting_average_overhead( rtems_boolean find_flag ) { - Timer_driver_Find_average_overhead = find_flag; + benchmark_timerfind_average_overhead = find_flag; } diff --git a/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S b/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S index 9121bad031..442d5daab5 100644 --- a/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S +++ b/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S @@ -2,7 +2,7 @@ * * 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 Read_timer() routine. + * into account in the benchmark_timerread() routine. * * Input parameters: NONE * diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index fe5e3cce8f..bbddd3047d 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog @@ -1,3 +1,8 @@ +2008-08-31 Joel Sherrill + + * timer/timer.c, timer/timerisr.S: Rename timer driver methods to + follow RTEMS programming conventions. + 2008-08-19 Ralf Corsépius * startup/cpuboot.c, startup/memcheck.c, timer/timer.c: diff --git a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c index 775116706f..57db48e26a 100644 --- a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c +++ b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c @@ -40,11 +40,11 @@ uint32_t Timer_interrupts; -rtems_boolean Timer_driver_Find_average_overhead; +rtems_boolean benchmark_timerfind_average_overhead; rtems_isr timerisr(void); -void Timer_initialize( void ) +void benchmark_timerinitialize( void ) { m302.reg.tmr2 = 0; /* disable timer */ @@ -56,7 +56,7 @@ void Timer_initialize( void ) } /* - * The following controls the behavior of Read_timer(). + * The following controls the behavior of benchmark_timerread(). * * FIND_AVG_OVERHEAD * instructs the routine to return the "raw" count. * @@ -75,7 +75,7 @@ void Timer_initialize( void ) /* * Return timer value in 1/2-microsecond units */ -int Read_timer( void ) +int benchmark_timerread( void ) { uint16_t clicks; uint32_t total; @@ -95,7 +95,7 @@ int Read_timer( void ) total = (Timer_interrupts * TRR2_VAL) + clicks; - if ( Timer_driver_Find_average_overhead == 1 ) + if ( benchmark_timerfind_average_overhead == 1 ) return total; /* in XXX microsecond units */ if ( total < LEAST_VALID ) @@ -113,14 +113,14 @@ int Read_timer( void ) * in Timing Test Suite. */ -rtems_status_code Empty_function(void) +rtems_status_code benchmark_timerempty_function(void) { return RTEMS_SUCCESSFUL; } -void Set_find_average_overhead( +void benchmark_timerdisable_subtracting_average_overhead( rtems_boolean find_flag ) { - Timer_driver_Find_average_overhead = find_flag; + benchmark_timerfind_average_overhead = find_flag; } diff --git a/c/src/lib/libbsp/m68k/ods68302/timer/timerisr.S b/c/src/lib/libbsp/m68k/ods68302/timer/timerisr.S index 16ef5a5e9b..fdaf24ae82 100644 --- a/c/src/lib/libbsp/m68k/ods68302/timer/timerisr.S +++ b/c/src/lib/libbsp/m68k/ods68302/timer/timerisr.S @@ -4,7 +4,7 @@ * All code in this routine is pure overhead which can perturb the * accuracy of RTEMS' timing test suite. * - * See also: Read_timer() + * See also: benchmark_timerread() * * To reduce overhead this is best to be the "rawest" hardware interupt * handler you can write. This should be the only interrupt which can -- cgit v1.2.3