summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/gen68302
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2011-02-09 08:38:15 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2011-02-09 08:38:15 +0000
commitd085040aef952f77797a4852e1e618eee1ede644 (patch)
tree7837cfb826f102edeefae870797f3cf9e7ed77c8 /c/src/lib/libbsp/m68k/gen68302
parent2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-d085040aef952f77797a4852e1e618eee1ede644.tar.bz2
2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>. Fix benchmark_timer_read() definition.
Diffstat (limited to 'c/src/lib/libbsp/m68k/gen68302')
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/gen68302/timer/timer.c3
2 files changed, 7 insertions, 1 deletions
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;