summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/arm/edb7312
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2011-02-09 11:38:36 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2011-02-09 11:38:36 +0000
commit14102e1ebd67d3ff07589a35a4a9fb6aeb6f5010 (patch)
tree2cabcb84e15f1204131ad4d0284270f1f721a50b /c/src/lib/libbsp/arm/edb7312
parent2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-14102e1ebd67d3ff07589a35a4a9fb6aeb6f5010.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/arm/edb7312')
-rw-r--r--c/src/lib/libbsp/arm/edb7312/ChangeLog5
-rw-r--r--c/src/lib/libbsp/arm/edb7312/timer/timer.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog
index 1407b08cf5..46f14f0940 100644
--- a/c/src/lib/libbsp/arm/edb7312/ChangeLog
+++ b/c/src/lib/libbsp/arm/edb7312/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/arm/edb7312/timer/timer.c b/c/src/lib/libbsp/arm/edb7312/timer/timer.c
index aa4165636d..fe3d8ae3cf 100644
--- a/c/src/lib/libbsp/arm/edb7312/timer/timer.c
+++ b/c/src/lib/libbsp/arm/edb7312/timer/timer.c
@@ -22,6 +22,7 @@
#include <rtems.h>
#include <bsp.h>
+#include <rtems/btimer.h>
#include <ep7312.h>
uint16_t tstart;
@@ -48,7 +49,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 )
{
uint16_t t;
uint32_t total;