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

	* timer/timer.c: Include <rtems/btimer.h>.
	Fix benchmark_timer_read() definition.

10 files changed, 35 insertions, 5 deletions

diff --git a/c/src/lib/libbsp/m68k/av5282/ChangeLog b/c/src/lib/libbsp/m68k/av5282/ChangeLog
index 16d47fa713..ce7d4efafa 100644
--- a/c/src/lib/libbsp/m68k/av5282/ChangeLog
+++ b/c/src/lib/libbsp/m68k/av5282/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.
diff --git a/c/src/lib/libbsp/m68k/av5282/timer/timer.c b/c/src/lib/libbsp/m68k/av5282/timer/timer.c
index ba638cd17a..8a8323e547 100644
--- a/c/src/lib/libbsp/m68k/av5282/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/av5282/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 MCF5282_TIMER3_DTCN;
diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog
index 06708fe7d6..137ecaa141 100644
--- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68302/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.
diff --git a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c
index 998b5da54e..7099bb670a 100644
--- a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c
@@ -11,6 +11,7 @@
 
 #include <rtems.h>
 #include <bsp.h>
+#include <rtems/btimer.h>
 #include <rtems/m68k/m68302.h>
 
 #define TMR2_VAL 0x071b	/* Timer mode register
@@ -65,7 +66,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 )
 {
   uint16_t         clicks;
   uint32_t         total;
diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
index b1bb463b12..0ee944e8b8 100644
--- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68340/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.
diff --git a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c
index c14e85769a..df4ce25ca4 100644
--- a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c
@@ -36,6 +36,7 @@
 
 #include <rtems.h>
 #include <bsp.h>
+#include <rtems/btimer.h>
 #include <m340uart.h>
 #include <m340timer.h>
 #include <m68340.h>
@@ -251,7 +252,7 @@ void benchmark_timer_initialize (void)
   Output parameters: -
   Description: Return timer value in microsecond units
  *****************************************************/
-int
+uint32_t
 benchmark_timer_read (void)
 {
  /* there's CLOCK_SPEED / 16 micro seconds between two timer register decrement */
diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog
index d21e182467..b48f827b47 100644
--- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog
+++ b/c/src/lib/libbsp/m68k/ods68302/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.
diff --git a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c
index 3b87450982..d8e60178ee 100644
--- a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c
@@ -14,6 +14,7 @@
 
 #include <rtems.h>
 #include <bsp.h>
+#include <rtems/btimer.h>
 #include <rtems/m68k/m68302.h>
 
 #define TMR2_VAL 0x071b	/* Timer mode register
@@ -68,7 +69,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 )
 {
   uint16_t         clicks;
   uint32_t         total;
diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog
index 1b21881f18..1eb24c1b29 100644
--- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog
+++ b/c/src/lib/libbsp/m68k/uC5282/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.
diff --git a/c/src/lib/libbsp/m68k/uC5282/timer/timer.c b/c/src/lib/libbsp/m68k/uC5282/timer/timer.c
index 47c1b55a13..6a926438da 100644
--- a/c/src/lib/libbsp/m68k/uC5282/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/uC5282/timer/timer.c
@@ -15,6 +15,7 @@
 
 #include <rtems.h>
 #include <bsp.h>
+#include <rtems/btimer.h>
 
 void
 benchmark_timer_initialize(void)
@@ -34,7 +35,7 @@ benchmark_timer_initialize(void)
 /*
  * Return timer value in microsecond units
  */
-int
+uint32_t
 benchmark_timer_read(void)
 {
     return MCF5282_TIMER3_DTCN;