summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/genmcf548x
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2011-02-09 12:15:54 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2011-02-09 12:15:54 +0000
commit26c173775a7f6ac412d0715ede1ab86a1f9169a9 (patch)
treeac8b1f5b02947032ceadeb724c0bb80b8baf3099 /c/src/lib/libbsp/m68k/genmcf548x
parent2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-26c173775a7f6ac412d0715ede1ab86a1f9169a9.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/genmcf548x')
-rw-r--r--c/src/lib/libbsp/m68k/genmcf548x/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog
index 6e0e14d443..13b139feb4 100644
--- 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.
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c b/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c
index 4fae6d18ec..96841b522c 100644
--- 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;