diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-09 06:33:58 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-02-09 06:33:58 +0000 |
| commit | ec54b2b5e8e1290e59ad0b19ebb168b34eee5dd7 (patch) | |
| tree | 1fbad6935628c029d628ae6c1bedc3d87516ac1b | |
| parent | 2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-ec54b2b5e8e1290e59ad0b19ebb168b34eee5dd7.tar.bz2 | |
2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
* timer/timer.c: Include <rtems/btimer.h>.
Fix benchmark_timer_read() definition.
| -rw-r--r-- | c/src/lib/libbsp/sparc/erc32/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/erc32/timer/timer.c | 3 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon2/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon2/timer/timer.c | 3 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/timer/timer.c | 3 |
6 files changed, 21 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog index b1274faad0..3e84f6e077 100644 --- a/c/src/lib/libbsp/sparc/erc32/ChangeLog +++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog @@ -1,5 +1,10 @@ 2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org> + * timer/timer.c: Include <rtems/btimer.h>. + Fix benchmark_timer_read() definition. + +2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org> + * make/custom/erc32.cfg: Remove -ftest-coverage. 2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org> diff --git a/c/src/lib/libbsp/sparc/erc32/timer/timer.c b/c/src/lib/libbsp/sparc/erc32/timer/timer.c index 39a0bc2b48..fe8b95ae02 100644 --- a/c/src/lib/libbsp/sparc/erc32/timer/timer.c +++ b/c/src/lib/libbsp/sparc/erc32/timer/timer.c @@ -21,6 +21,7 @@ */ #include <bsp.h> +#include <rtems/btimer.h> bool benchmark_timer_find_average_overhead; @@ -63,7 +64,7 @@ void benchmark_timer_initialize(void) #define LEAST_VALID 13 /* Don't trust a value lower than this */ #endif -int benchmark_timer_read(void) +uint32_t benchmark_timer_read(void) { uint32_t total; diff --git a/c/src/lib/libbsp/sparc/leon2/ChangeLog b/c/src/lib/libbsp/sparc/leon2/ChangeLog index 3e83524e83..c047190d90 100644 --- a/c/src/lib/libbsp/sparc/leon2/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon2/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/sparc/leon2/timer/timer.c b/c/src/lib/libbsp/sparc/leon2/timer/timer.c index 4c139b44f5..8987350302 100644 --- a/c/src/lib/libbsp/sparc/leon2/timer/timer.c +++ b/c/src/lib/libbsp/sparc/leon2/timer/timer.c @@ -21,6 +21,7 @@ #include <bsp.h> +#include <rtems/btimer.h> bool benchmark_timer_find_average_overhead; @@ -53,7 +54,7 @@ void benchmark_timer_initialize(void) /* to start/stop the timer. */ #define LEAST_VALID 2 /* Don't trust a value lower than this */ -int benchmark_timer_read(void) +uint32_t benchmark_timer_read(void) { uint32_t total; diff --git a/c/src/lib/libbsp/sparc/leon3/ChangeLog b/c/src/lib/libbsp/sparc/leon3/ChangeLog index 92fcbd44dc..6a2b366a08 100644 --- a/c/src/lib/libbsp/sparc/leon3/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon3/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/sparc/leon3/timer/timer.c b/c/src/lib/libbsp/sparc/leon3/timer/timer.c index 47de8339dc..f747dd64d8 100644 --- a/c/src/lib/libbsp/sparc/leon3/timer/timer.c +++ b/c/src/lib/libbsp/sparc/leon3/timer/timer.c @@ -21,6 +21,7 @@ #include <bsp.h> +#include <rtems/btimer.h> #if defined(RTEMS_MULTIPROCESSING) #define LEON3_TIMER_INDEX \ @@ -57,7 +58,7 @@ void benchmark_timer_initialize(void) /* to start/stop the timer. */ #define LEAST_VALID 2 /* Don't trust a value lower than this */ -int benchmark_timer_read(void) +uint32_t benchmark_timer_read(void) { uint32_t total; |