summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/gen68340
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/gen68340
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/gen68340')
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/timer/timer.c3
2 files changed, 7 insertions, 1 deletions
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 */