summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-30 16:27:16 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2008-09-30 16:27:16 +0000
commit290da88f5a3e1908c2d9ab234199650308591a0e (patch)
tree3b89da25558ceeeba429da8ddaf6df89ea043ec0
parent42650f0282b615397212df75fdcf68c161a7df3d (diff)
downloadrtems-290da88f5a3e1908c2d9ab234199650308591a0e.tar.bz2
2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
* timer/timer.c: Eliminate uses of old benchmark timer names.
-rw-r--r--c/src/lib/libbsp/i386/i386ex/ChangeLog4
-rw-r--r--c/src/lib/libbsp/i386/i386ex/timer/timer.c16
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/ChangeLog4
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/timer/timer.c16
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/ChangeLog4
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/timer/timer.c12
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/ChangeLog4
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/timer/timer.c2
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/ChangeLog4
-rw-r--r--c/src/lib/libbsp/m68k/gen68360/timer/timer.c3
-rw-r--r--c/src/lib/libbsp/m68k/idp/ChangeLog4
-rw-r--r--c/src/lib/libbsp/m68k/idp/timer/timer.c16
-rw-r--r--c/src/lib/libbsp/m68k/mrm332/ChangeLog4
-rw-r--r--c/src/lib/libbsp/m68k/mrm332/timer/timer.c12
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/ChangeLog4
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/timer/timer.c16
-rw-r--r--c/src/lib/libbsp/m68k/mvme147/ChangeLog4
-rw-r--r--c/src/lib/libbsp/m68k/mvme147/timer/timer.c12
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/ChangeLog4
-rw-r--r--c/src/lib/libbsp/m68k/mvme162/timer/timer.c14
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/ChangeLog4
-rw-r--r--c/src/lib/libbsp/m68k/ods68302/timer/timer.c9
-rw-r--r--c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog4
-rw-r--r--c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c25
-rw-r--r--c/src/lib/libcpu/mips/ChangeLog4
-rw-r--r--c/src/lib/libcpu/mips/timer/timer.c8
26 files changed, 74 insertions, 139 deletions
diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog
index 39c3d72a81..89cf37145a 100644
--- a/c/src/lib/libbsp/i386/i386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Eliminate uses of old benchmark timer names.
+
2008-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect
diff --git a/c/src/lib/libbsp/i386/i386ex/timer/timer.c b/c/src/lib/libbsp/i386/i386ex/timer/timer.c
index 814ad01709..96f013f9eb 100644
--- a/c/src/lib/libbsp/i386/i386ex/timer/timer.c
+++ b/c/src/lib/libbsp/i386/i386ex/timer/timer.c
@@ -1,18 +1,4 @@
-/* Timer_init()
- *
- * This routine initializes the timer on the FORCE CPU-386 board.
- *
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * NOTE: This routine will not work if the optimizer is enabled
- * for some compilers. The multiple writes to the Z8036
- * may be optimized away.
- *
- * It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
+/*
* COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR).
*
diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
index b63e86a92c..5c8f493bd3 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Eliminate uses of old benchmark timer names.
+
2008-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect
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 bb28035bc3..9eb3687848 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c
@@ -1,18 +1,4 @@
-/* Timer_init()
- *
- * This routine initializes the timer on the FORCE CPU-386 board.
- *
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * NOTE: This routine will not work if the optimizer is enabled
- * for some compilers. The multiple writes to the Z8036
- * may be optimized away.
- *
- * It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
+/*
* COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR).
*
diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
index 621507fa3d..a08629f1a8 100644
--- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Eliminate uses of old benchmark timer names.
+
2008-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect
diff --git a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c
index 02c58a2a17..998b5da54e 100644
--- a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c
@@ -1,14 +1,4 @@
-/* Timer_init()
- *
- * This routine initializes TIMER 2 for an MC68302.
- *
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * NOTE: It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
+/*
* COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR).
*
diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
index 70867ceb4d..bb1706006f 100644
--- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Eliminate uses of old benchmark timer names.
+
2008-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect
diff --git a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c
index 64038ee4d2..3331385976 100644
--- a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c
@@ -1,6 +1,4 @@
/*
- * Timer_init()
- *
* ATTENTION: AS MC68349 has no built-in Timer, the following code doesn't work
* in a MC68349. You can't use FIFO full mode for the moment, but
* it should be easy to fix this by using an external timer
diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
index 8868fce35e..867b7c7c53 100644
--- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Eliminate uses of old benchmark timer names.
+
2008-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect
diff --git a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c
index 430ed28cec..f169a00db7 100644
--- a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c
@@ -1,8 +1,5 @@
/*
- * Timer_init()
- *
* Use TIMER 1 and TIMER 2 for Timing Test Suite
- *
* The hardware on the MC68360 makes these routines very simple.
*
* Based on the `gen68302' board support package, and covered by the
diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog
index c6e2ded702..6d634d6c6a 100644
--- a/c/src/lib/libbsp/m68k/idp/ChangeLog
+++ b/c/src/lib/libbsp/m68k/idp/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Eliminate uses of old benchmark timer names.
+
2008-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect
diff --git a/c/src/lib/libbsp/m68k/idp/timer/timer.c b/c/src/lib/libbsp/m68k/idp/timer/timer.c
index a9aaa7f9df..0a644ab5da 100644
--- a/c/src/lib/libbsp/m68k/idp/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/idp/timer/timer.c
@@ -1,18 +1,4 @@
-/* Timer_init()
- *
- * This routine initializes the MC68230 timer on the Motorola IDP board.
- *
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * NOTE: This routine will not work if the optimizer is enabled
- * for some compilers. The multiple writes to the MC68230
- * may be optimized away.
- *
- * It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
+/*
* Code Modified for the MC68230 by Doug McBride, Colorado Space Grant College
*
* COPYRIGHT (c) 1989-1999.
diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
index c9eced5c24..c029744cfc 100644
--- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Eliminate uses of old benchmark timer names.
+
2008-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect
diff --git a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c
index e0b8a29eeb..7d386ad9c2 100644
--- a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c
@@ -1,14 +1,4 @@
-/* Timer_init()
- *
- * This routine is not implemented for this BSP.
- *
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * NOTE: It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
+/*
* COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR).
*
diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
index 8867a37a35..5bae9e5aba 100644
--- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Eliminate uses of old benchmark timer names.
+
2008-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect
diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
index 45471891f1..7194a04a3e 100644
--- a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
@@ -1,18 +1,4 @@
-/* Timer_init()
- *
- * This routine initializes the Z8036 timer on the MVME136 board.
- *
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * NOTE: This routine will not work if the optimizer is enabled
- * for some compilers. The multiple writes to the Z8036
- * may be optimized away.
- *
- * It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
+/*
* COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR).
*
diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog
index c58ebf27fd..d153563b82 100644
--- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Eliminate uses of old benchmark timer names.
+
2008-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect
diff --git a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
index a7ba99b756..18a6029e54 100644
--- a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
@@ -1,14 +1,4 @@
-/* Timer_init()
- *
- * This routine initializes the PCC timer on the MVME147 board.
- *
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * NOTE: It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
+/*
* COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR).
*
diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
index b8bead0acf..794c6ce840 100644
--- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Eliminate uses of old benchmark timer names.
+
2008-09-30 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect
diff --git a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
index 507ea04206..815eca45e4 100644
--- a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
@@ -1,18 +1,6 @@
-/* Timer_init()
- *
+/*
* This routine initializes the Tick Timer 1 on the MVME162 board.
*
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * NOTE: This routine will not work if the optimizer is enabled
- * for some compilers. The multiple writes
- * may be optimized away.
- *
- * It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
* COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR).
*
diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog
index f18f676255..137718bd09 100644
--- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Eliminate uses of old benchmark timer names.
+
2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate *_SOURCES.
diff --git a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c
index 02c58a2a17..3b87450982 100644
--- a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c
@@ -1,14 +1,7 @@
-/* Timer_init()
+/*
*
* This routine initializes TIMER 2 for an MC68302.
*
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * NOTE: It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
* COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR).
*
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
index 3df36ce137..a8ea262e27 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Eliminate uses of old benchmark timer names.
+
2008-09-29 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Eliminate bsp.am. Build startup files as side-effect
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c b/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c
index d47daf30ec..276fff340c 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c
@@ -21,7 +21,7 @@
| this file contains the console driver |
\*===============================================================*/
/*
- * Timer_init()
+ * benchmark_timer_initialize()
*
* Use TIMER 1 and TIMER 2 for Timing Test Suite
*
@@ -52,8 +52,10 @@
#include <bsp.h>
#include <mpc8xx.h>
+bool benchmark_timer_find_average_overhead;
+
void
-Timer_initialize (void)
+benchmark_timer_initialize (void)
{
/*
* Reset timers 1 and 2
@@ -84,8 +86,7 @@ Timer_initialize (void)
/*
* Return timer value in microsecond units
*/
-int
-Read_timer (void)
+int benchmark_timer_read(void)
{
int retval;
retval = *(uint32_t*)&m8xx.tcn1;
@@ -93,17 +94,9 @@ Read_timer (void)
return retval;
}
-/*
- * Empty function call used in loops to measure basic cost of looping
- * in Timing Test Suite.
- */
-rtems_status_code
-Empty_function (void)
-{
- return RTEMS_SUCCESSFUL;
-}
-
-void
-Set_find_average_overhead(bool find_flag)
+void benchmark_timer_disable_subtracting_average_overhead(
+ bool find_flag
+)
{
+ benchmark_timer_find_average_overhead = find_flag;
}
diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog
index 7b1ee4692d..66812bb9dc 100644
--- a/c/src/lib/libcpu/mips/ChangeLog
+++ b/c/src/lib/libcpu/mips/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * timer/timer.c: Eliminate uses of old benchmark timer names.
+
2008-09-05 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c: The Shared Memory Driver no longer requires the
diff --git a/c/src/lib/libcpu/mips/timer/timer.c b/c/src/lib/libcpu/mips/timer/timer.c
index cd5906ce59..a8a7aacc21 100644
--- a/c/src/lib/libcpu/mips/timer/timer.c
+++ b/c/src/lib/libcpu/mips/timer/timer.c
@@ -53,11 +53,11 @@
extern uint32_t mips_read_timer( void );
static bool benchmark_timer_find_average_overhead;
-static uint32_t Timer_initial_value = 0;
+static uint32_t benchmark_timer_initial_value = 0;
void benchmark_timer_initialize( void )
{
- Timer_initial_value = mips_read_timer();
+ benchmark_timer_initial_value = mips_read_timer();
/*
* Somehow start the timer
*/
@@ -90,11 +90,11 @@ int benchmark_timer_read( void )
*/
clicks = mips_read_timer(); /* XXX: read some HW here */
- if (clicks < Timer_initial_value)
+ if (clicks < benchmark_timer_initial_value)
{
clicks += TIMER_MAX_VALUE;
}
- clicks -= Timer_initial_value;
+ clicks -= benchmark_timer_initial_value;
/*
* Total is calculated by taking into account the number of timer overflow