2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>

* timer/timer.c: Include <rtems/btimer.h>. Fix benchmark_timer_read() definition.
2011-02-09 12:15:54 +00:00
parent 097c600163
commit 26c173775a
30 changed files with 104 additions and 14 deletions
--- a/c/src/lib/libbsp/arm/nds/ChangeLog
+++ b/c/src/lib/libbsp/arm/nds/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/arm/nds/timer/timer.c
+++ b/c/src/lib/libbsp/arm/nds/timer/timer.c
@@ -12,6 +12,7 @@
 */

 #include <rtems.h>
+#include <rtems/btimer.h>
 #include <bsp.h>
 #include <nds.h>

--- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c
@@ -32,6 +32,7 @@
 */

 #include <rtems.h>
+#include <rtems/btimer.h>
 #include <bsp.h>
 #include <rtems/m68k/m68360.h>

@@ -69,7 +70,7 @@ benchmark_timer_initialize (void)
 /*
 * Return timer value in microsecond units
 */
-int
+uint32_t
 benchmark_timer_read (void)
 {
 	unsigned short val;
--- a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog
+++ b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c
@@ -51,6 +51,7 @@
 */

 #include <rtems.h>
+#include <rtems/btimer.h>
 #include <bsp.h>
 #include <mcf548x/mcf548x.h>

@@ -67,7 +68,7 @@ void benchmark_timer_initialize(void)
 * Return timer value in microsecond units
 * XLB clock 100 MHz / 1us is equal to 100 counts
 */
-int
+uint32_t
 benchmark_timer_read(void)
 {
    microsecond_timer_value = (0xFFFFFFFF - MCF548X_SLT_SCNT1)/100;
--- a/c/src/lib/libbsp/m68k/idp/ChangeLog
+++ b/c/src/lib/libbsp/m68k/idp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/m68k/idp/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/idp/timer/timer.c
@@ -12,6 +12,7 @@
 */

 #include <rtems.h>
+#include <rtems/btimer.h>
 #include <bsp.h>
 #include <rtems/motorola/mc68230.h>

@@ -50,7 +51,7 @@ void benchmark_timer_initialize(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_timer_read(void)
+uint32_t benchmark_timer_read(void)
 {
  uint8_t         data;
  uint8_t          msb, osb, lsb;
--- a/c/src/lib/libbsp/m68k/mcf52235/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf52235/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c
@@ -14,6 +14,7 @@
 */

 #include <rtems.h>
+#include <rtems/btimer.h>
 #include <bsp.h>

 void benchmark_timer_initialize(void)
@@ -28,7 +29,7 @@ void benchmark_timer_initialize(void)
 /*
 * Return timer value in microsecond units
 */
-int benchmark_timer_read(void)
+uint32_t benchmark_timer_read(void)
 {
  return MCF_DTIM3_DTCN;
 }
--- a/c/src/lib/libbsp/m68k/mcf5225x/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf5225x/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c
@@ -16,6 +16,7 @@
 */

 #include <rtems.h>
+#include <rtems/btimer.h>
 #include <bsp.h>

 void benchmark_timer_initialize(void)
@@ -30,7 +31,7 @@ void benchmark_timer_initialize(void)
 /*
 * Return timer value in microsecond units
 */
-int benchmark_timer_read(void)
+uint32_t benchmark_timer_read(void)
 {
  return MCF_DTIM3_DTCN;
 }
--- a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c
@@ -5,6 +5,7 @@
 */

 #include <rtems.h>
+#include <rtems/btimer.h>
 #include <bsp.h>

 void
@@ -21,7 +22,7 @@ benchmark_timer_initialize(void)
 /*
 * Return timer value in microsecond units
 */
-int
+uint32_t
 benchmark_timer_read(void)
 {
    return MCF5235_TIMER3_DTCN;
--- a/c/src/lib/libbsp/m68k/mcf5329/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf5329/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c
@@ -15,6 +15,7 @@
 */

 #include <rtems.h>
+#include <rtems/btimer.h>
 #include <bsp.h>

 void benchmark_timer_initialize(void)
@@ -29,7 +30,7 @@ void benchmark_timer_initialize(void)
 /*
 * Return timer value in microsecond units
 */
-int benchmark_timer_read(void)
+uint32_t benchmark_timer_read(void)
 {
  return MCF_DTIM3_DTCN;
 }
--- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c
@@ -9,6 +9,7 @@
 *  $Id$
 */

+#include <rtems/btimer.h>
 #include <bsp.h>

 bool benchmark_timer_find_average_overhead;
@@ -39,7 +40,7 @@ void benchmark_timer_initialize( void )
 /*
 * Return timer value in 1/2-microsecond units
 */
-int benchmark_timer_read( void )
+uint32_t benchmark_timer_read( void )
 {
  uint32_t         total;
  total = 0;
--- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
@@ -9,6 +9,7 @@
 *  $Id$
 */

+#include <rtems/btimer.h>
 #include <bsp.h>
 #include <rtems/zilog/z8036.h>

@@ -51,7 +52,7 @@ void benchmark_timer_initialize(void)
                             /* (6 countdowns) to start/stop the timer. */
 #define LEAST_VALID       10 /* Don't trust a value lower than this */

-int benchmark_timer_read(void)
+uint32_t benchmark_timer_read(void)
 {
 /*
  uint8_t          msb, lsb;
--- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
@@ -13,6 +13,7 @@
 *  $Id$
 */

+#include <rtems/btimer.h>
 #include <bsp.h>

 #define TIMER_INT_LEVEL 6
@@ -46,7 +47,7 @@ void benchmark_timer_initialize(void)
 				synchronized whith the counter updates*/
 #define LEAST_VALID       10 /* Don't trust a value lower than this */

-int benchmark_timer_read(void)
+uint32_t benchmark_timer_read(void)
 {
  uint32_t         total;
  uint16_t         counter_value;
--- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
@@ -19,6 +19,7 @@
 */

 #include <rtems.h>
+#include <rtems/btimer.h>
 #include <bsp.h>

 /* Periodic tick interval */
@@ -51,7 +52,7 @@ void benchmark_timer_initialize(void)
                                /* (3 countdowns) to start/stop the timer. */
 #define LEAST_VALID       10U   /* Don't trust a value lower than this */

-int benchmark_timer_read(void)
+uint32_t benchmark_timer_read(void)
 {
  uint32_t            total;

--- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c
@@ -31,6 +31,7 @@
 */

 #include <rtems.h>
+#include <rtems/btimer.h>
 #include <bsp.h>

 /* Periodic tick interval */
@@ -105,7 +106,7 @@ void benchmark_timer_initialize(void)
 *  LEAST_VALID is the lowest number this routine should trust.  Numbers
 *  below this are "noise" and zero is returned.
 */
-int benchmark_timer_read(void)
+uint32_t benchmark_timer_read(void)
 {
  uint32_t            total;

--- a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog
+++ b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c
+++ b/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c
@@ -23,6 +23,7 @@
 #define TIMER_WRAPS_AFTER_1MS 0

 #include <rtems.h>
+#include <rtems/btimer.h>
 #include <rtems/score/cpu.h>
 #include <bsp.h>

@@ -97,7 +98,7 @@ void benchmark_timer_initialize( void )

 #define LEAST_VALID AVG_OVERHEAD /* Don't trust a value lower than this */

-int benchmark_timer_read( void )
+uint32_t benchmark_timer_read( void )
 {
  uint32_t timer_wraps;
  uint32_t timer_snap;
--- a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* timer/timer.c: Include <rtems/btimer.h>.
+	Fix benchmark_timer_read() definition.
+
 2011-02-02	Ralf Corsépius <ralf.corsepius@rtems.org>

 	* configure.ac: Require autoconf-2.68, automake-1.11.1.
--- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c
@@ -19,6 +19,7 @@
 */

 #include <rtems.h>
+#include <rtems/btimer.h>
 #include <bsp.h>

 uint32_t         Timer_interrupts;
@@ -54,7 +55,7 @@ void benchmark_timer_initialize( void )
                             /* This value is in microseconds. */
 #define LEAST_VALID       1  /* Don't trust a clicks value lower than this */

-int benchmark_timer_read( void )
+uint32_t benchmark_timer_read( void )
 {
  uint32_t         clicks;
  uint32_t         total;