diff options
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68302/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68302/timer/timer.c | 16 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68302/timer/timerisr.S | 2 |
3 files changed, 14 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index eb5cb6233c..a08021aa38 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,8 @@ +2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com> + + * timer/timer.c, timer/timerisr.S: 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/gen68302/timer/timer.c b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c index 775116706f..57db48e26a 100644 --- a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68302/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/gen68302/timer/timerisr.S b/c/src/lib/libbsp/m68k/gen68302/timer/timerisr.S index 16ef5a5e9b..fdaf24ae82 100644 --- a/c/src/lib/libbsp/m68k/gen68302/timer/timerisr.S +++ b/c/src/lib/libbsp/m68k/gen68302/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 |