summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/nios2
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/lib/libbsp/nios2')
-rw-r--r--c/src/lib/libbsp/nios2/nios2_iss/ChangeLog5
-rw-r--r--c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog
index 6e3a83cf8c..9c6bbf7a94 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog
+++ b/c/src/lib/libbsp/nios2/nios2_iss/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/nios2/nios2_iss/timer/timer.c b/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c
index 91fcdc6c5c..38a3231739 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c
+++ b/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c
@@ -23,6 +23,7 @@
#define TIMER_WRAPS_AFTER_1MS 0
#include <rtems.h>
+#include <rtems/btimer.h>
#include <rtems/score/cpu.h>
#include <bsp.h>
@@ -97,7 +98,7 @@ void benchmark_timer_initialize( void )
#define LEAST_VALID AVG_OVERHEAD /* Don't trust a value lower than this */
-int benchmark_timer_read( void )
+uint32_t benchmark_timer_read( void )
{
uint32_t timer_wraps;
uint32_t timer_snap;