summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-08-31 18:18:17 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-08-31 18:18:17 +0000
commit25c62b02bc8fc9e66c1735e562e91acaa94abbe3 (patch)
tree1310e9509ef176a712ba98e4b2664da7d9cc4d63 /c
parent2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-25c62b02bc8fc9e66c1735e562e91acaa94abbe3.tar.bz2
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
* timer/timer.c: Eliminate empty function from every benchmark timer driver. Fix spelling.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/ChangeLog5
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/timer/timer.c28
-rw-r--r--c/src/lib/libbsp/i386/i386ex/ChangeLog5
-rw-r--r--c/src/lib/libbsp/i386/i386ex/timer/timer.c19
-rw-r--r--c/src/lib/libbsp/i386/pc386/ChangeLog5
-rw-r--r--c/src/lib/libbsp/i386/pc386/timer/timer.c64
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/ChangeLog5
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/timer/timer.c23
-rw-r--r--c/src/lib/libbsp/m68k/av5282/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/av5282/timer/timer.c16
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/timer/timer.c16
-rw-r--r--c/src/lib/libbsp/m68k/genmcf548x/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c23
-rw-r--r--c/src/lib/libbsp/m68k/idp/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/idp/timer/timer.c17
-rw-r--r--c/src/lib/libbsp/m68k/mcf52235/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/mcf52235/timer/timer.c15
-rw-r--r--c/src/lib/libbsp/m68k/mcf5235/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/mcf5235/timer/timer.c16
-rw-r--r--c/src/lib/libbsp/m68k/mcf5329/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/mcf5329/timer/timer.c15
-rw-r--r--c/src/lib/libbsp/m68k/mrm332/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/mrm332/timer/timer.c24
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/timer/timer.c17
-rw-r--r--c/src/lib/libbsp/m68k/mvme147/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/mvme147/timer/timer.c15
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/timer/timer.c17
-rw-r--r--c/src/lib/libbsp/m68k/uC5282/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/uC5282/timer/timer.c16
-rw-r--r--c/src/lib/libbsp/mips/csb350/ChangeLog5
-rw-r--r--c/src/lib/libbsp/mips/csb350/timer/timer.c17
-rw-r--r--c/src/lib/libbsp/mips/genmongoosev/ChangeLog5
-rw-r--r--c/src/lib/libbsp/mips/genmongoosev/timer/timer.c17
-rw-r--r--c/src/lib/libbsp/mips/jmr3904/ChangeLog5
-rw-r--r--c/src/lib/libbsp/mips/jmr3904/timer/timer.c17
-rw-r--r--c/src/lib/libbsp/nios2/nios2_iss/ChangeLog5
-rw-r--r--c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c28
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/ChangeLog5
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/timer/timer.c21
-rw-r--r--c/src/lib/libbsp/sh/simsh4/ChangeLog5
-rw-r--r--c/src/lib/libbsp/sh/simsh4/timer/timer.c36
44 files changed, 259 insertions, 328 deletions
diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
index 56041647b1..e370394074 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
+++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/c4x/c4xsim/timer/timer.c b/c/src/lib/libbsp/c4x/c4xsim/timer/timer.c
index ceab1582cb..999cd6a2a3 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/timer/timer.c
+++ b/c/src/lib/libbsp/c4x/c4xsim/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.
@@ -23,11 +23,11 @@
#include <rtems/tic4x/c4xio.h>
uint32_t Timer_interrupts;
-rtems_boolean benchmark_timerfind_average_overhead;
+rtems_boolean benchmark_timer_find_average_overhead;
static uint32_t start;
-void benchmark_timerinitialize( void )
+void benchmark_timer_initialize( void )
{
/*
@@ -48,7 +48,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.
@@ -62,7 +62,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;
@@ -83,7 +83,7 @@ int benchmark_timerread( void )
total = clicks * 1;
- if ( benchmark_timerfind_average_overhead == 1 ) {
+ if ( benchmark_timer_find_average_overhead == 1 ) {
return total; /* in count units where each count is */
/* 1 / (clock frequency/2) */
} else {
@@ -97,19 +97,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/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index 4266931270..b876f1b4d6 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/i386/i386ex/timer/timer.c b/c/src/lib/libbsp/i386/i386ex/timer/timer.c
index 0dfd77a437..ccaef6585d 100644
--- a/c/src/lib/libbsp/i386/i386ex/timer/timer.c
+++ b/c/src/lib/libbsp/i386/i386ex/timer/timer.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
int Ttimer_val;
-rtems_boolean benchmark_timerfind_average_overhead;
+rtems_boolean benchmark_timer_find_average_overhead;
extern void timerisr(void);
extern int ClockIsOn(const rtems_raw_irq_connect_data*);
@@ -81,7 +81,7 @@ void Timer_exit(void)
}
}
-void benchmark_timerinitialize(void)
+void benchmark_timer_initialize(void)
{
static rtems_boolean First = TRUE;
@@ -92,7 +92,7 @@ void benchmark_timerinitialize(void)
atexit(Timer_exit); /* Try not to hose the system at exit. */
if (!i386_set_idt_entry (&timer_raw_irq_data)) {
- printk("benchmark_timerinitialize: raw handler installation failed\n");
+ printk("benchmark_timer_initialize: raw handler installation failed\n");
rtems_fatal_error_occurred(1);
}
}
@@ -107,7 +107,7 @@ void benchmark_timerinitialize(void)
/* (3 ticks) to start/stop the timer. */
#define LEAST_VALID 4 /* Don't trust a value lower than this */
-int benchmark_timerread(void)
+int benchmark_timer_read(void)
{
register uint32_t clicks;
register uint32_t total;
@@ -124,7 +124,7 @@ int benchmark_timerread(void)
/* ??? Is "do not restore old vector" causing problems? */
- if ( benchmark_timerfind_average_overhead == 1 )
+ if ( benchmark_timer_find_average_overhead == 1 )
return total; /* in one microsecond units */
else {
@@ -134,14 +134,9 @@ int benchmark_timerread(void)
}
}
-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/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index 667294fb76..1c1e4b3d23 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/i386/pc386/timer/timer.c b/c/src/lib/libbsp/i386/pc386/timer/timer.c
index f1f7cd41b4..52903e934d 100644
--- a/c/src/lib/libbsp/i386/pc386/timer/timer.c
+++ b/c/src/lib/libbsp/i386/pc386/timer/timer.c
@@ -59,10 +59,10 @@
| Global Variables
+--------------------------------------------------------------------------*/
volatile uint32_t Ttimer_val;
-rtems_boolean benchmark_timerfind_average_overhead = TRUE;
+rtems_boolean benchmark_timer_find_average_overhead = TRUE;
volatile unsigned int fastLoop1ms, slowLoop1ms;
-void (*benchmark_timerinitialize_function)(void) = 0;
-uint32_t (*benchmark_timerread_function)(void) = 0;
+void (*benchmark_timer_initialize_function)(void) = 0;
+uint32_t (*benchmark_timer_read_function)(void) = 0;
void (*Timer_exit_function)(void) = 0;
/*-------------------------------------------------------------------------+
@@ -112,7 +112,7 @@ tsc_timer_exit(void)
} /* tsc_timer_exit */
/*-------------------------------------------------------------------------+
-| Function: benchmark_timerinitialize
+| Function: benchmark_timer_initialize
| Description: Timer initialization routine.
| Global Variables: Ttimer_val.
| Arguments: None.
@@ -133,9 +133,9 @@ tsc_timer_initialize(void)
} /* tsc_timer_initialize */
/*-------------------------------------------------------------------------+
-| Function: benchmark_timerread
+| Function: benchmark_timer_read
| Description: Read hardware timer value.
-| Global Variables: Ttimer_val, benchmark_timerfind_average_overhead.
+| Global Variables: Ttimer_val, benchmark_timer_find_average_overhead.
| Arguments: None.
| Returns: Nothing.
+--------------------------------------------------------------------------*/
@@ -146,7 +146,7 @@ tsc_read_timer(void)
total = (uint32_t)(rdtsc() - Ttimer_val);
- if (benchmark_timerfind_average_overhead)
+ if (benchmark_timer_find_average_overhead)
return total;
else if (total < LEAST_VALID)
return 0; /* below timer resolution */
@@ -222,7 +222,7 @@ i386_timer_exit(void)
} /* Timer_exit */
/*-------------------------------------------------------------------------+
-| Function: benchmark_timerinitialize
+| Function: benchmark_timer_initialize
| Description: Timer initialization routine.
| Global Variables: Ttimer_val.
| Arguments: None.
@@ -248,12 +248,12 @@ i386_timer_initialize(void)
while (Ttimer_val == 0)
continue;
Ttimer_val = 0;
-} /* benchmark_timerinitialize */
+} /* benchmark_timer_initialize */
/*-------------------------------------------------------------------------+
-| Function: benchmark_timerread
+| Function: benchmark_timer_read
| Description: Read hardware timer value.
-| Global Variables: Ttimer_val, benchmark_timerfind_average_overhead.
+| Global Variables: Ttimer_val, benchmark_timer_find_average_overhead.
| Arguments: None.
| Returns: Nothing.
+--------------------------------------------------------------------------*/
@@ -269,7 +269,7 @@ i386_read_timer(void)
clicks = (msb << 8) | lsb;
total = (Ttimer_val * US_PER_ISR) + (US_PER_ISR - TICK_TO_US(clicks));
- if (benchmark_timerfind_average_overhead)
+ if (benchmark_timer_find_average_overhead)
return total;
else if (total < LEAST_VALID)
return 0; /* below timer resolution */
@@ -283,7 +283,7 @@ i386_read_timer(void)
*/
void
-benchmark_timerinitialize(void)
+benchmark_timer_initialize(void)
{
static rtems_boolean First = TRUE;
@@ -292,27 +292,27 @@ benchmark_timerinitialize(void)
#if defined(DEBUG)
printk("TSC: timer initialization\n");
#endif /* DEBUG */
- benchmark_timerinitialize_function = &tsc_timer_initialize;
- benchmark_timerread_function = &tsc_read_timer;
+ benchmark_timer_initialize_function = &tsc_timer_initialize;
+ benchmark_timer_read_function = &tsc_read_timer;
Timer_exit_function = &tsc_timer_exit;
}
else {
#if defined(DEBUG)
printk("ISR: timer initialization\n");
#endif /* DEBUG */
- benchmark_timerinitialize_function = &i386_timer_initialize;
- benchmark_timerread_function = &i386_read_timer;
+ benchmark_timer_initialize_function = &i386_timer_initialize;
+ benchmark_timer_read_function = &i386_read_timer;
Timer_exit_function = &i386_timer_exit;
}
First = FALSE;
}
- (*benchmark_timerinitialize_function)();
+ (*benchmark_timer_initialize_function)();
}
uint32_t
-benchmark_timerread(void)
+benchmark_timer_read(void)
{
- return (*benchmark_timerread_function)();
+ return (*benchmark_timer_read_function)();
}
void
@@ -322,29 +322,17 @@ Timer_exit(void)
}
/*-------------------------------------------------------------------------+
-| Function: benchmark_timerempty_function
-| Description: Empty function used in time tests.
-| Global Variables: None.
-| Arguments: None.
-| Returns: Nothing.
-+--------------------------------------------------------------------------*/
-rtems_status_code benchmark_timerempty_function(void)
-{
- return RTEMS_SUCCESSFUL;
-} /* Empty function */
-
-/*-------------------------------------------------------------------------+
-| Function: benchmark_timerdisable_subtracting_average_overhead
-| Description: Set internal benchmark_timerfind_average_overhead flag value.
-| Global Variables: benchmark_timerfind_average_overhead.
+| Function: benchmark_timer_disable_subtracting_average_overhead
+| Description: Set internal benchmark_timer_find_average_overhead flag value.
+| Global Variables: benchmark_timer_find_average_overhead.
| Arguments: find_flag - new value of the flag.
| Returns: Nothing.
+--------------------------------------------------------------------------*/
void
-benchmark_timerdisable_subtracting_average_overhead(rtems_boolean find_flag)
+benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag)
{
- benchmark_timerfind_average_overhead = find_flag;
-} /* benchmark_timerdisable_subtracting_average_overhead */
+ benchmark_timer_find_average_overhead = find_flag;
+} /* benchmark_timer_disable_subtracting_average_overhead */
static unsigned short lastLoadedValue;
diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
index 5cf2bee835..dc8cebb907 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c b/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c
index 0746869648..5ab4188797 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
volatile uint32_t Ttimer_val; /* Updated from ISR!!! */
-rtems_boolean benchmark_timerfind_average_overhead;
+rtems_boolean benchmark_timer_find_average_overhead;
extern void timerisr(void);
@@ -96,7 +96,7 @@ void Timer_exit(void)
}
}
-void benchmark_timerinitialize(void)
+void benchmark_timer_initialize(void)
{
static rtems_boolean First = TRUE;
@@ -106,18 +106,18 @@ void benchmark_timerinitialize(void)
First = FALSE;
if (!i386_get_current_idt_entry (&old_raw_irq_data)) {
- printk("benchmark_timerinitialize: failed to get old raw irq entry.\n");
+ printk("benchmark_timer_initialize: failed to get old raw irq entry.\n");
rtems_fatal_error_occurred(1);
}
if (!i386_delete_idt_entry (&old_raw_irq_data)) {
- printk("benchmark_timerinitialize: failed to delete old raw irq entry.\n");
+ printk("benchmark_timer_initialize: failed to delete old raw irq entry.\n");
rtems_fatal_error_occurred(1);
}
atexit(Timer_exit); /* Try not to hose the system at exit. */
if (!i386_set_idt_entry (&timer_raw_irq_data)) {
- printk("benchmark_timerinitialize: raw handler installation failed.\n");
+ printk("benchmark_timer_initialize: raw handler installation failed.\n");
rtems_fatal_error_occurred(1);
}
}
@@ -133,7 +133,7 @@ void benchmark_timerinitialize(void)
/* (3 ticks) to start/stop the timer. */
#define LEAST_VALID 4 /* Don't trust a value lower than this */
-int benchmark_timerread(void)
+int benchmark_timer_read(void)
{
register uint32_t clicks, total;
register uint8_t lsb, msb;
@@ -155,7 +155,7 @@ int benchmark_timerread(void)
clicks = (msb << 8) | lsb;
total = Ttimer_val * US_PER_ISR + (US_PER_ISR - clicks);
- if ( benchmark_timerfind_average_overhead == 1 )
+ if ( benchmark_timer_find_average_overhead == 1 )
return total; /* in one microsecond units */
else if ( total < LEAST_VALID )
return 0; /* below timer resolution */
@@ -163,16 +163,11 @@ int benchmark_timerread(void)
return (total - AVG_OVERHEAD);
}
-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/m68k/av5282/ChangeLog b/c/src/lib/libbsp/m68k/av5282/ChangeLog
index c31c47c2b9..ec84957a19 100644
--- a/c/src/lib/libbsp/m68k/av5282/ChangeLog
+++ b/c/src/lib/libbsp/m68k/av5282/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/m68k/av5282/timer/timer.c b/c/src/lib/libbsp/m68k/av5282/timer/timer.c
index a9da61530c..2caf75b66d 100644
--- a/c/src/lib/libbsp/m68k/av5282/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/av5282/timer/timer.c
@@ -8,7 +8,7 @@
#include <bsp.h>
void
-benchmark_timerinitialize(void)
+benchmark_timer_initialize(void)
{
int preScaleDivisor = 58;
int div = MCF5282_TIMER_DTMR_CLK_DIV1;
@@ -22,22 +22,12 @@ benchmark_timerinitialize(void)
* Return timer value in microsecond units
*/
int
-benchmark_timerread(void)
+benchmark_timer_read(void)
{
return MCF5282_TIMER3_DTCN;
}
-/*
- * 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(rtems_boolean find_flag)
+benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag)
{
}
diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
index dd014ad236..fad87b68b7 100644
--- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c
index 528e451472..3370b1c379 100644
--- a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c
@@ -39,7 +39,7 @@
#include <rtems/m68k/m68360.h>
void
-benchmark_timerinitialize (void)
+benchmark_timer_initialize (void)
{
/*
* Reset timers 1 and 2
@@ -73,22 +73,12 @@ benchmark_timerinitialize (void)
* Return timer value in microsecond units
*/
int
-benchmark_timerread (void)
+benchmark_timer_read (void)
{
return *(uint32_t*)&m360.tcn1;
}
-/*
- * 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(rtems_boolean find_flag)
+benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag)
{
}
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog
index 44c676b334..36b1061840 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog
+++ b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c b/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c
index 670d9e1d3e..2fa25576eb 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c
@@ -54,10 +54,10 @@
#include <bsp.h>
#include <mcf548x/mcf548x.h>
-rtems_boolean benchmark_timerfind_average_overhead;
+rtems_boolean benchmark_timer_find_average_overhead;
static uint32_t microsecond_timer_value = 0;
-void benchmark_timerinitialize(void)
+void benchmark_timer_initialize(void)
{
MCF548X_SLT_SLTCNT1 = 0xFFFFFFFF;
MCF548X_SLT_SCR1 |= (MCF548X_SLT_SCR_TEN | MCF548X_SLT_SCR_RUN);
@@ -68,27 +68,14 @@ MCF548X_SLT_SCR1 |= (MCF548X_SLT_SCR_TEN | MCF548X_SLT_SCR_RUN);
* XLB clock 100 MHz / 1us is equal to 100 counts
*/
int
-benchmark_timerread(void)
+benchmark_timer_read(void)
{
microsecond_timer_value = (0xFFFFFFFF - MCF548X_SLT_SCNT1)/100;
return microsecond_timer_value;
}
-/*
- * 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(rtems_boolean find_flag)
+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/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog
index 348d41dfa6..75063120a2 100644
--- a/c/src/lib/libbsp/m68k/idp/ChangeLog
+++ b/c/src/lib/libbsp/m68k/idp/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/m68k/idp/timer/timer.c b/c/src/lib/libbsp/m68k/idp/timer/timer.c
index c5f9bdd476..61d17f2686 100644
--- a/c/src/lib/libbsp/m68k/idp/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/idp/timer/timer.c
@@ -32,11 +32,11 @@
#define TIMER_VECTOR 0x4D
int Ttimer_val;
-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)
{
(void) set_vector( timerisr, TIMER_VECTOR, 0 ); /* install ISR */
@@ -64,7 +64,7 @@ void benchmark_timerinitialize(void)
#define AVG_OVERHEAD 9 /* may not be right -- do this later */
#define LEAST_VALID 10 /* Don't trust a value lower than this */
-int benchmark_timerread(void)
+int benchmark_timer_read(void)
{
uint8_t data;
uint8_t msb, osb, lsb;
@@ -93,7 +93,7 @@ int benchmark_timerread(void)
MC68230_WRITE (MC68230_TCR, 0xA1);
/* do not restore old vector */
- if ( benchmark_timerfind_average_overhead == 1 )
+ if ( benchmark_timer_find_average_overhead == 1 )
return total; /* in countdown units */
if ( total < LEAST_VALID )
@@ -105,14 +105,9 @@ int benchmark_timerread(void)
return (total - AVG_OVERHEAD);
}
-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/m68k/mcf52235/ChangeLog b/c/src/lib/libbsp/m68k/mcf52235/ChangeLog
index 5ccef54242..714df21598 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf52235/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c b/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c
index a9b2040c2d..12a325bd8b 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c
@@ -16,7 +16,7 @@
#include <rtems.h>
#include <bsp.h>
-void benchmark_timerinitialize(void)
+void benchmark_timer_initialize(void)
{
uint32_t preScaleDivisor = bsp_get_CPU_clock_speed() / 1000000;
@@ -28,20 +28,11 @@ void benchmark_timerinitialize(void)
/*
* Return timer value in microsecond units
*/
-int benchmark_timerread(void)
+int benchmark_timer_read(void)
{
return MCF_DTIM3_DTCN;
}
-/*
- * 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(rtems_boolean find_flag)
+void benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag)
{
}
diff --git a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog
index 04c352cb75..5fd6bffb22 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c b/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c
index 3bcd878377..b209d06147 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c
@@ -8,7 +8,7 @@
#include <bsp.h>
void
-benchmark_timerinitialize(void)
+benchmark_timer_initialize(void)
{
int preScaleDivisor = 0x4A;
int div = MCF5235_TIMER_DTMR_CLK_DIV1;
@@ -22,22 +22,12 @@ benchmark_timerinitialize(void)
* Return timer value in microsecond units
*/
int
-benchmark_timerread(void)
+benchmark_timer_read(void)
{
return MCF5235_TIMER3_DTCN;
}
-/*
- * 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(rtems_boolean find_flag)
+benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag)
{
}
diff --git a/c/src/lib/libbsp/m68k/mcf5329/ChangeLog b/c/src/lib/libbsp/m68k/mcf5329/ChangeLog
index dd21df7476..7184bcaa0c 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf5329/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c b/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c
index 57a7caae59..801bcf2f6f 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c
@@ -17,7 +17,7 @@
#include <rtems.h>
#include <bsp.h>
-void benchmark_timerinitialize(void)
+void benchmark_timer_initialize(void)
{
uint32_t preScaleDivisor = bsp_get_BUS_clock_speed() / 1000000;
@@ -29,20 +29,11 @@ void benchmark_timerinitialize(void)
/*
* Return timer value in microsecond units
*/
-int benchmark_timerread(void)
+int benchmark_timer_read(void)
{
return MCF_DTIM3_DTCN;
}
-/*
- * 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(rtems_boolean find_flag)
+void benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag)
{
}
diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
index 20341c568e..4bb840565c 100644
--- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c
index af6f038cd9..5dac6004ba 100644
--- a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c
@@ -21,16 +21,16 @@
#include <bsp.h>
-rtems_boolean benchmark_timerfind_average_overhead;
+rtems_boolean benchmark_timer_find_average_overhead;
extern rtems_isr Clock_isr(void);
-void benchmark_timerinitialize( void )
+void benchmark_timer_initialize( 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.
*
@@ -49,12 +49,12 @@ void benchmark_timerinitialize( void )
/*
* Return timer value in 1/2-microsecond units
*/
-int benchmark_timerread( void )
+int benchmark_timer_read( void )
{
uint32_t total;
total = 0;
- if ( benchmark_timerfind_average_overhead == 1 )
+ if ( benchmark_timer_find_average_overhead == 1 )
return total; /* in XXX microsecond units */
if ( total < LEAST_VALID )
@@ -63,19 +63,9 @@ int benchmark_timerread( void )
return (total - AVG_OVERHEAD);
}
-/*
- * 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/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
index fd45218721..8fca40a3e5 100644
--- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
index 9e6e8f7445..1bd6c869ce 100644
--- a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
@@ -29,11 +29,11 @@
#define TIMER 0xfffb0000 /* address of Z8036 on MVME136 */
int Ttimer_val;
-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)
{
(void) set_vector( timerisr, 66, 0 ); /* install ISR */
@@ -65,7 +65,7 @@ void benchmark_timerinitialize(void)
/* (6 countdowns) to start/stop the timer. */
#define LEAST_VALID 10 /* Don't trust a value lower than this */
-int benchmark_timerread(void)
+int benchmark_timer_read(void)
{
/*
uint8_t msb, lsb;
@@ -82,7 +82,7 @@ remaining = 0xffff - *((uint16_t*) 0xfffb0010);
*/
total = (Ttimer_val * 0x10000) + remaining;
- if ( benchmark_timerfind_average_overhead == 1 )
+ if ( benchmark_timer_find_average_overhead == 1 )
return total; /* in one-half microsecond units */
else {
@@ -92,14 +92,9 @@ remaining = 0xffff - *((uint16_t*) 0xfffb0010);
}
}
-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/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog
index 8fe93f9d02..c455e83995 100644
--- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
index c6c1f32221..2a8492645e 100644
--- a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
@@ -32,11 +32,11 @@
/* Each tick is 6.25 us */
int Ttimer_val;
-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)
{
(void) set_vector(timerisr, TIMER_1_VECTOR, 0); /* install ISR */
@@ -56,7 +56,7 @@ void benchmark_timerinitialize(void)
synchronized whith the counter updates*/
#define LEAST_VALID 10 /* Don't trust a value lower than this */
-int benchmark_timerread(void)
+int benchmark_timer_read(void)
{
uint32_t total;
uint16_t counter_value;
@@ -70,14 +70,9 @@ int benchmark_timerread(void)
}
-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/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
index 448a70034f..f5e43879ad 100644
--- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
index 4b4b666088..0a83d7c1d4 100644
--- a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
@@ -38,11 +38,11 @@
#define TIMER_INT_LEVEL 6
uint32_t Ttimer_val;
-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)
{
(void) set_vector( timerisr, VBR0 * 0x10 + 0x8, 0 );
@@ -63,13 +63,13 @@ void benchmark_timerinitialize(void)
/* (3 countdowns) to start/stop the timer. */
#define LEAST_VALID 10U /* Don't trust a value lower than this */
-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 == 1 )
+ if ( benchmark_timer_find_average_overhead == 1 )
return total; /* in one-half microsecond units */
if ( total < LEAST_VALID )
@@ -78,14 +78,9 @@ int benchmark_timerread(void)
return (total-AVG_OVERHEAD) >> 1;
}
-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/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog
index 0e584b1f1c..1ec00f0950 100644
--- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog
+++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/m68k/uC5282/timer/timer.c b/c/src/lib/libbsp/m68k/uC5282/timer/timer.c
index 2d421e31d2..763df724b3 100644
--- a/c/src/lib/libbsp/m68k/uC5282/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/uC5282/timer/timer.c
@@ -17,7 +17,7 @@
#include <bsp.h>
void
-benchmark_timerinitialize(void)
+benchmark_timer_initialize(void)
{
int preScaleDivisor = bsp_get_CPU_clock_speed() / 1000000;
int div = MCF5282_TIMER_DTMR_CLK_DIV1;
@@ -35,22 +35,12 @@ benchmark_timerinitialize(void)
* Return timer value in microsecond units
*/
int
-benchmark_timerread(void)
+benchmark_timer_read(void)
{
return MCF5282_TIMER3_DTCN;
}
-/*
- * 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(rtems_boolean find_flag)
+benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag)
{
}
diff --git a/c/src/lib/libbsp/mips/csb350/ChangeLog b/c/src/lib/libbsp/mips/csb350/ChangeLog
index 5e2e99b530..5799cd2a31 100644
--- a/c/src/lib/libbsp/mips/csb350/ChangeLog
+++ b/c/src/lib/libbsp/mips/csb350/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/mips/csb350/timer/timer.c b/c/src/lib/libbsp/mips/csb350/timer/timer.c
index b02eefe58c..705af4446d 100644
--- a/c/src/lib/libbsp/mips/csb350/timer/timer.c
+++ b/c/src/lib/libbsp/mips/csb350/timer/timer.c
@@ -16,10 +16,10 @@
#include <bsp.h>
-rtems_boolean benchmark_timerfind_average_overhead;
+rtems_boolean benchmark_timer_find_average_overhead;
uint32_t tstart;
-void benchmark_timerinitialize(void)
+void benchmark_timer_initialize(void)
{
asm volatile ("mfc0 %0, $9\n" : "=r" (tstart));
/* tick time in picooseconds */
@@ -30,7 +30,7 @@ void benchmark_timerinitialize(void)
#define LEAST_VALID 1 /* Don't trust a value lower than this */
/* tx39 simulator can count instructions. :) */
-int benchmark_timerread(void)
+int benchmark_timer_read(void)
{
uint32_t total;
uint32_t cnt;
@@ -41,7 +41,7 @@ int benchmark_timerread(void)
total = (total * 1000) / 396; /* convert to nanoseconds */
- if ( benchmark_timerfind_average_overhead == 1 )
+ if ( benchmark_timer_find_average_overhead == 1 )
return total; /* in one microsecond units */
if ( total < LEAST_VALID )
@@ -50,14 +50,9 @@ int benchmark_timerread(void)
return total - AVG_OVERHEAD;
}
-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/mips/genmongoosev/ChangeLog b/c/src/lib/libbsp/mips/genmongoosev/ChangeLog
index 270c149c4b..3de157a18a 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/ChangeLog
+++ b/c/src/lib/libbsp/mips/genmongoosev/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c b/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c
index 04e17a578c..035bc3f757 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c
+++ b/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c
@@ -15,7 +15,7 @@
#include <bsp.h>
-rtems_boolean benchmark_timerfind_average_overhead;
+rtems_boolean benchmark_timer_find_average_overhead;
#if defined(USE_TIMER2_FOR_CLOCK)
#define TIMER_BASE MONGOOSEV_TIMER1_BASE
@@ -25,7 +25,7 @@ rtems_boolean benchmark_timerfind_average_overhead;
#define TIMER_VECTOR MONGOOSEV_IRQ_TIMER2
#endif
-void benchmark_timerinitialize(void)
+void benchmark_timer_initialize(void)
{
/*
* Programming the compare register as the maximum value should let
@@ -56,7 +56,7 @@ void benchmark_timerinitialize(void)
/* mongoose-v can count cycles. :) */
#include <rtems/bspIo.h>
-int benchmark_timerread(void)
+int benchmark_timer_read(void)
{
uint32_t clicks;
uint32_t total;
@@ -75,7 +75,7 @@ int benchmark_timerread(void)
if ( tcr & MONGOOSEV_TIMER_CONTROL_TIMEOUT )
printk( "MG5 timer overran\n" );
- if ( benchmark_timerfind_average_overhead == 1 )
+ if ( benchmark_timer_find_average_overhead == 1 )
return total; /* in cycle units */
if ( total < LEAST_VALID )
@@ -84,16 +84,11 @@ int benchmark_timerread(void)
return (total - AVG_OVERHEAD) / CPU_CLOCK_RATE_MHZ;
}
-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;
}
/* eof */
diff --git a/c/src/lib/libbsp/mips/jmr3904/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/ChangeLog
index 561eb9dd33..aed8cdbe6b 100644
--- a/c/src/lib/libbsp/mips/jmr3904/ChangeLog
+++ b/c/src/lib/libbsp/mips/jmr3904/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/mips/jmr3904/timer/timer.c b/c/src/lib/libbsp/mips/jmr3904/timer/timer.c
index 163298c7ac..c70688d3fb 100644
--- a/c/src/lib/libbsp/mips/jmr3904/timer/timer.c
+++ b/c/src/lib/libbsp/mips/jmr3904/timer/timer.c
@@ -17,9 +17,9 @@
#include <bsp.h>
-rtems_boolean benchmark_timerfind_average_overhead;
+rtems_boolean benchmark_timer_find_average_overhead;
-void benchmark_timerinitialize(void)
+void benchmark_timer_initialize(void)
{
/*
* Programming the compare register as the maximum value should let
@@ -45,13 +45,13 @@ void benchmark_timerinitialize(void)
#define LEAST_VALID 1 /* Don't trust a value lower than this */
/* tx39 simulator can count instructions. :) */
-int benchmark_timerread(void)
+int benchmark_timer_read(void)
{
uint32_t total;
total = TX3904_TIMER_READ( TX3904_TIMER1_BASE, TX3904_TIMER_TRR );
- if ( benchmark_timerfind_average_overhead == 1 )
+ if ( benchmark_timer_find_average_overhead == 1 )
return total; /* in one microsecond units */
if ( total < LEAST_VALID )
@@ -60,14 +60,9 @@ int benchmark_timerread(void)
return total - AVG_OVERHEAD;
}
-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/nios2/nios2_iss/ChangeLog b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog
index 042d616a00..739f930b4e 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog
+++ b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c b/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c
index 75588f8421..d51c606e5a 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c
+++ b/c/src/lib/libbsp/nios2/nios2_iss/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.
@@ -27,7 +27,7 @@
#include <bsp.h>
volatile uint32_t Timer_interrupts;
-rtems_boolean benchmark_timerfind_average_overhead;
+rtems_boolean benchmark_timer_find_average_overhead;
#define TIMER_REGS ((altera_avalon_timer_regs*)NIOS2_IO_BASE(TIMER_BASE))
@@ -37,7 +37,7 @@ void timerisr( void )
Timer_interrupts++;
}
-void benchmark_timerinitialize( void )
+void benchmark_timer_initialize( void )
{
uint32_t old_ie;
@@ -83,7 +83,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.
@@ -97,7 +97,7 @@ void benchmark_timerinitialize( void )
#define LEAST_VALID AVG_OVERHEAD /* Don't trust a value lower than this */
-int benchmark_timerread( void )
+int benchmark_timer_read( void )
{
uint32_t timer_wraps;
uint32_t timer_snap;
@@ -128,24 +128,14 @@ int benchmark_timerread( void )
if(total < LEAST_VALID) return 0;
- if(benchmark_timerfind_average_overhead != TRUE) total-= AVG_OVERHEAD;
+ if(benchmark_timer_find_average_overhead != TRUE) total-= AVG_OVERHEAD;
return total;
}
-/*
- * 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/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
index 9d114653c2..d9b29cb237 100644
--- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/powerpc/score603e/timer/timer.c b/c/src/lib/libbsp/powerpc/score603e/timer/timer.c
index dfca87aa3a..38b94ed314 100644
--- a/c/src/lib/libbsp/powerpc/score603e/timer/timer.c
+++ b/c/src/lib/libbsp/powerpc/score603e/timer/timer.c
@@ -23,13 +23,13 @@
uint64_t Timer_driver_Start_time;
-rtems_boolean benchmark_timerfind_average_overhead;
+rtems_boolean benchmark_timer_find_average_overhead;
/*
- * benchmark_timerinitialize
+ * benchmark_timer_initialize
*/
-void benchmark_timerinitialize()
+void benchmark_timer_initialize()
{
/*
@@ -40,10 +40,10 @@ void benchmark_timerinitialize()
}
/*
- * benchmark_timerread
+ * benchmark_timer_read
*/
-int benchmark_timerread()
+int benchmark_timer_read()
{
uint64_t clicks;
uint64_t total64;
@@ -61,7 +61,7 @@ int benchmark_timerread()
total = (uint32_t) total64;
- if ( benchmark_timerfind_average_overhead == 1 )
+ if ( benchmark_timer_find_average_overhead == 1 )
return total; /* in "clicks" of the decrementer units */
if ( total < BSP_TIMER_LEAST_VALID )
@@ -70,14 +70,9 @@ int benchmark_timerread()
return BSP_Convert_decrementer(total - BSP_TIMER_AVG_OVERHEAD);
}
-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/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog
index 1dfae5e7f5..6554e1a057 100644
--- a/c/src/lib/libbsp/sh/simsh4/ChangeLog
+++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog
@@ -1,5 +1,10 @@
2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * timer/timer.c: Eliminate empty function from every benchmark timer
+ driver. Fix spelling.
+
+2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* timer/timer.c: Rename timer driver methods to follow RTEMS
programming conventions.
diff --git a/c/src/lib/libbsp/sh/simsh4/timer/timer.c b/c/src/lib/libbsp/sh/simsh4/timer/timer.c
index a261df3860..c5b50138c5 100644
--- a/c/src/lib/libbsp/sh/simsh4/timer/timer.c
+++ b/c/src/lib/libbsp/sh/simsh4/timer/timer.c
@@ -22,12 +22,12 @@
uint32_t Timer_interrupts;
-bool benchmark_timerfind_average_overhead;
+bool benchmark_timer_find_average_overhead;
/* External assembler interrupt handler routine */
extern rtems_isr timerisr(rtems_vector_number vector);
-/* benchmark_timerinitialize --
+/* benchmark_timer_initialize --
* Initialize timer 2 for accurate time measurement.
*
* PARAMETERS:
@@ -37,13 +37,13 @@ extern rtems_isr timerisr(rtems_vector_number vector);
* none
*/
void
-benchmark_timerinitialize(void)
+benchmark_timer_initialize(void)
{
return;
}
/*
- * 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.
*
@@ -59,7 +59,7 @@ benchmark_timerinitialize(void)
/* This value is in microseconds. */
#define LEAST_VALID 1 /* Don't trust a clicks value lower than this */
-/* benchmark_timerread --
+/* benchmark_timer_read --
* Read timer value in microsecond units since timer start.
*
* PARAMETERS:
@@ -69,30 +69,14 @@ benchmark_timerinitialize(void)
* number of microseconds since timer has been started
*/
int
-benchmark_timerread( void )
+benchmark_timer_read( void )
{
return 0;
}
-/* benchmark_timerempty_function --
- * Empty function call used in loops to measure basic cost of looping
- * in Timing Test Suite.
- *
- * PARAMETERS:
- * none
- *
- * RETURNS:
- * RTEMS_SUCCESSFUL
- */
-rtems_status_code
-benchmark_timerempty_function(void)
-{
- return RTEMS_SUCCESSFUL;
-}
-
-/* benchmark_timerdisable_subtracting_average_overhead --
+/* benchmark_timer_disable_subtracting_average_overhead --
* This routine is invoked by the "Check Timer" (tmck) test in the
- * RTEMS Timing Test Suite. It makes the benchmark_timerread routine not
+ * RTEMS Timing Test Suite. It makes the benchmark_timer_read routine not
* subtract the overhead required to initialize and read the benchmark
* timer.
*
@@ -103,7 +87,7 @@ benchmark_timerempty_function(void)
* none
*/
void
-benchmark_timerdisable_subtracting_average_overhead(bool find_flag)
+benchmark_timer_disable_subtracting_average_overhead(bool find_flag)
{
- benchmark_timerfind_average_overhead = find_flag;
+ benchmark_timer_find_average_overhead = find_flag;
}