RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
* timer/timer.c, timer/timerisr.S: Eliminate empty function from every
	benchmark timer driver. Fix spelling.
This commit is contained in:
Joel Sherrill
2008-08-31 18:17:35 +00:00
parent 722ab6dd03
commit 6b2923cbc3
9 changed files with 42 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/m68k/gen68302/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
* timer/timer.c, timer/timerisr.S: Eliminate empty function from every
benchmark timer driver. Fix spelling.
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
* timer/timer.c, timer/timerisr.S: Rename timer driver methods to

24
c/src/lib/libbsp/m68k/gen68302/timer/timer.c
View File

@@ -40,11 +40,11 @@
uint32_t Timer_interrupts;
rtems_boolean benchmark_timerfind_average_overhead;
rtems_boolean benchmark_timer_find_average_overhead;
rtems_isr timerisr(void);
void benchmark_timerinitialize( void )
void benchmark_timer_initialize( void )
{
m302.reg.tmr2 = 0; /* disable timer */
@@ -56,7 +56,7 @@ void benchmark_timerinitialize( void )
}
/*
* The following controls the behavior of benchmark_timerread().
* The following controls the behavior of benchmark_timer_read().
*
* FIND_AVG_OVERHEAD * instructs the routine to return the "raw" count.
*
@@ -75,7 +75,7 @@ void benchmark_timerinitialize( void )
/*
* Return timer value in 1/2-microsecond units
*/
int benchmark_timerread( void )
int benchmark_timer_read( void )
{
uint16_t clicks;
uint32_t total;
@@ -95,7 +95,7 @@ int benchmark_timerread( void )
total = (Timer_interrupts * TRR2_VAL) + clicks;
if ( benchmark_timerfind_average_overhead == 1 )
if ( benchmark_timer_find_average_overhead == 1 )
return total; /* in XXX microsecond units */
if ( total < LEAST_VALID )
@@ -108,19 +108,9 @@ int benchmark_timerread( void )
return (total - AVG_OVERHEAD) >> 1;
}
/*
* 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;
}

2
c/src/lib/libbsp/m68k/gen68302/timer/timerisr.S
View File

@@ -4,7 +4,7 @@
* All code in this routine is pure overhead which can perturb the
* accuracy of RTEMS' timing test suite.
*
* See also: benchmark_timerread()
* See also: benchmark_timer_read()
*
* To reduce overhead this is best to be the "rawest" hardware interupt
* handler you can write. This should be the only interrupt which can

5
c/src/lib/libbsp/m68k/mvme167/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
* timer/timer.c, timer/timerisr.S: Eliminate empty function from every
benchmark timer driver. Fix spelling.
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
* timer/timer.c, timer/timerisr.S: Rename timer driver methods to

33
c/src/lib/libbsp/m68k/mvme167/timer/timer.c
View File

@@ -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 benchmark_timerinitialize() and
* benchmark_timerread(). benchmark_timerread() usually returns the number of microseconds
* since benchmark_timerinitialize() exitted.
* Each measured time period is demarcated by calls to benchmark_timer_initialize() and
* benchmark_timer_read(). benchmark_timer_read() usually returns the number of microseconds
* since benchmark_timer_initialize() 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 benchmark_timerfind_average_overhead;
rtems_boolean benchmark_timer_find_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 benchmark_timerinitialize(void)
void benchmark_timer_initialize(void)
{
(void) set_vector( timerisr, TIMER_VECTOR, 0 );
@@ -105,13 +105,13 @@ void benchmark_timerinitialize(void)
* LEAST_VALID is the lowest number this routine should trust. Numbers
* below this are "noise" and zero is returned.
*/
int benchmark_timerread(void)
int benchmark_timer_read(void)
{
uint32_t total;
total = (Ttimer_val * TICK_INTERVAL) + lcsr->timer_cnt_1;
if ( benchmark_timerfind_average_overhead )
if ( benchmark_timer_find_average_overhead )
return total; /* in one microsecond units */
if ( total < LEAST_VALID )
@@ -121,29 +121,16 @@ int benchmark_timerread(void)
}
/*
* Empty function call used in loops to measure basic cost of looping
* in Timing Test Suite.
*
* Input parameters: NONE
*
* Output parameters: time in microseconds
*/
rtems_status_code benchmark_timerempty_function( void )
{
return RTEMS_SUCCESSFUL;
}
/*
* This routine sets the benchmark_timerfind_average_overhead flag in this
* This routine sets the benchmark_timer_find_average_overhead flag in this
* module.
*
* Input parameters: NONE
*
* Output parameters: time in microseconds
*/
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;
}

2
c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S
View File

@@ -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 benchmark_timerread() routine.
* into account in the benchmark_timer_read() routine.
*
* Input parameters: NONE
*

5
c/src/lib/libbsp/m68k/ods68302/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
* timer/timer.c, timer/timerisr.S: Eliminate empty function from every
benchmark timer driver. Fix spelling.
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
* timer/timer.c, timer/timerisr.S: Rename timer driver methods to

24
c/src/lib/libbsp/m68k/ods68302/timer/timer.c
View File

@@ -40,11 +40,11 @@
uint32_t Timer_interrupts;
rtems_boolean benchmark_timerfind_average_overhead;
rtems_boolean benchmark_timer_find_average_overhead;
rtems_isr timerisr(void);
void benchmark_timerinitialize( void )
void benchmark_timer_initialize( void )
{
m302.reg.tmr2 = 0; /* disable timer */
@@ -56,7 +56,7 @@ void benchmark_timerinitialize( void )
}
/*
* The following controls the behavior of benchmark_timerread().
* The following controls the behavior of benchmark_timer_read().
*
* FIND_AVG_OVERHEAD * instructs the routine to return the "raw" count.
*
@@ -75,7 +75,7 @@ void benchmark_timerinitialize( void )
/*
* Return timer value in 1/2-microsecond units
*/
int benchmark_timerread( void )
int benchmark_timer_read( void )
{
uint16_t clicks;
uint32_t total;
@@ -95,7 +95,7 @@ int benchmark_timerread( void )
total = (Timer_interrupts * TRR2_VAL) + clicks;
if ( benchmark_timerfind_average_overhead == 1 )
if ( benchmark_timer_find_average_overhead == 1 )
return total; /* in XXX microsecond units */
if ( total < LEAST_VALID )
@@ -108,19 +108,9 @@ int benchmark_timerread( void )
return (total - AVG_OVERHEAD) >> 1;
}
/*
* 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;
}

2
c/src/lib/libbsp/m68k/ods68302/timer/timerisr.S
View File

@@ -4,7 +4,7 @@
* All code in this routine is pure overhead which can perturb the
* accuracy of RTEMS' timing test suite.
*
* See also: benchmark_timerread()
* See also: benchmark_timer_read()
*
* To reduce overhead this is best to be the "rawest" hardware interupt
* handler you can write. This should be the only interrupt which can