diff options
30 files changed, 104 insertions, 14 deletions
diff --git a/c/src/lib/libbsp/arm/nds/ChangeLog b/c/src/lib/libbsp/arm/nds/ChangeLog index 2f08f61316..88a82d3f1b 100644 --- a/c/src/lib/libbsp/arm/nds/ChangeLog +++ b/c/src/lib/libbsp/arm/nds/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/nds/timer/timer.c b/c/src/lib/libbsp/arm/nds/timer/timer.c index f1fa220bfa..e62fe6b795 100644 --- a/c/src/lib/libbsp/arm/nds/timer/timer.c +++ b/c/src/lib/libbsp/arm/nds/timer/timer.c @@ -12,6 +12,7 @@ */ #include <rtems.h> +#include <rtems/btimer.h> #include <bsp.h> #include <nds.h> diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index 3018c76d40..f7c4fac007 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/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/gen68360/timer/timer.c b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c index c541765d30..2d79eccd6d 100644 --- a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c @@ -32,6 +32,7 @@ */ #include <rtems.h> +#include <rtems/btimer.h> #include <bsp.h> #include <rtems/m68k/m68360.h> @@ -69,7 +70,7 @@ benchmark_timer_initialize (void) /* * Return timer value in microsecond units */ -int +uint32_t benchmark_timer_read (void) { unsigned short val; 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; diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index 14844ff4ab..3dddd12e3e 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/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/idp/timer/timer.c b/c/src/lib/libbsp/m68k/idp/timer/timer.c index e0e3f9b536..0e5786100a 100644 --- a/c/src/lib/libbsp/m68k/idp/timer/timer.c +++ b/c/src/lib/libbsp/m68k/idp/timer/timer.c @@ -12,6 +12,7 @@ */ #include <rtems.h> +#include <rtems/btimer.h> #include <bsp.h> #include <rtems/motorola/mc68230.h> @@ -50,7 +51,7 @@ void benchmark_timer_initialize(void) #define AVG_OVERHEAD 9 /* may not be right -- do this later */ #define LEAST_VALID 10 /* Don't trust a value lower than this */ -int benchmark_timer_read(void) +uint32_t benchmark_timer_read(void) { uint8_t data; uint8_t msb, osb, lsb; diff --git a/c/src/lib/libbsp/m68k/mcf52235/ChangeLog b/c/src/lib/libbsp/m68k/mcf52235/ChangeLog index 2bc14e8ff5..06ea365f02 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf52235/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/mcf52235/timer/timer.c b/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c index 1a83c166b3..de34876215 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c @@ -14,6 +14,7 @@ */ #include <rtems.h> +#include <rtems/btimer.h> #include <bsp.h> void benchmark_timer_initialize(void) @@ -28,7 +29,7 @@ void benchmark_timer_initialize(void) /* * Return timer value in microsecond units */ -int benchmark_timer_read(void) +uint32_t benchmark_timer_read(void) { return MCF_DTIM3_DTCN; } diff --git a/c/src/lib/libbsp/m68k/mcf5225x/ChangeLog b/c/src/lib/libbsp/m68k/mcf5225x/ChangeLog index 1bae729ef7..818659ab07 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5225x/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/mcf5225x/timer/timer.c b/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c index f6906a7d4a..dc22ca228e 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c @@ -16,6 +16,7 @@ */ #include <rtems.h> +#include <rtems/btimer.h> #include <bsp.h> void benchmark_timer_initialize(void) @@ -30,7 +31,7 @@ void benchmark_timer_initialize(void) /* * Return timer value in microsecond units */ -int benchmark_timer_read(void) +uint32_t benchmark_timer_read(void) { return MCF_DTIM3_DTCN; } diff --git a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog index f413f0a657..73b0290ed5 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5235/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/mcf5235/timer/timer.c b/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c index e2479c4c0f..6aae8e99e6 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c @@ -5,6 +5,7 @@ */ #include <rtems.h> +#include <rtems/btimer.h> #include <bsp.h> void @@ -21,7 +22,7 @@ benchmark_timer_initialize(void) /* * Return timer value in microsecond units */ -int +uint32_t benchmark_timer_read(void) { return MCF5235_TIMER3_DTCN; diff --git a/c/src/lib/libbsp/m68k/mcf5329/ChangeLog b/c/src/lib/libbsp/m68k/mcf5329/ChangeLog index 486f39700f..bef53f1631 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5329/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/mcf5329/timer/timer.c b/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c index ff18079b3a..8ebf4a5583 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c @@ -15,6 +15,7 @@ */ #include <rtems.h> +#include <rtems/btimer.h> #include <bsp.h> void benchmark_timer_initialize(void) @@ -29,7 +30,7 @@ void benchmark_timer_initialize(void) /* * Return timer value in microsecond units */ -int benchmark_timer_read(void) +uint32_t benchmark_timer_read(void) { return MCF_DTIM3_DTCN; } diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 1e0ea0d75a..6d909fb50c 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/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/mrm332/timer/timer.c b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c index 7d386ad9c2..93e80bda86 100644 --- a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c @@ -9,6 +9,7 @@ * $Id$ */ +#include <rtems/btimer.h> #include <bsp.h> bool benchmark_timer_find_average_overhead; @@ -39,7 +40,7 @@ void benchmark_timer_initialize( void ) /* * Return timer value in 1/2-microsecond units */ -int benchmark_timer_read( void ) +uint32_t benchmark_timer_read( void ) { uint32_t total; total = 0; diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index 5183df6af7..25d4c5cea1 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/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/mvme136/timer/timer.c b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c index 7194a04a3e..0793b04cf5 100644 --- a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c @@ -9,6 +9,7 @@ * $Id$ */ +#include <rtems/btimer.h> #include <bsp.h> #include <rtems/zilog/z8036.h> @@ -51,7 +52,7 @@ void benchmark_timer_initialize(void) /* (6 countdowns) to start/stop the timer. */ #define LEAST_VALID 10 /* Don't trust a value lower than this */ -int benchmark_timer_read(void) +uint32_t benchmark_timer_read(void) { /* uint8_t msb, lsb; diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index 9536c0a7fa..013fe91548 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/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/mvme147/timer/timer.c b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c index 87e86217b6..b0397eac35 100644 --- a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c @@ -13,6 +13,7 @@ * $Id$ */ +#include <rtems/btimer.h> #include <bsp.h> #define TIMER_INT_LEVEL 6 @@ -46,7 +47,7 @@ void benchmark_timer_initialize(void) synchronized whith the counter updates*/ #define LEAST_VALID 10 /* Don't trust a value lower than this */ -int benchmark_timer_read(void) +uint32_t benchmark_timer_read(void) { uint32_t total; uint16_t counter_value; diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index b0ba12b049..33160b94cd 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/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/mvme162/timer/timer.c b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c index 815eca45e4..c7534bac4c 100644 --- a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c @@ -19,6 +19,7 @@ */ #include <rtems.h> +#include <rtems/btimer.h> #include <bsp.h> /* Periodic tick interval */ @@ -51,7 +52,7 @@ void benchmark_timer_initialize(void) /* (3 countdowns) to start/stop the timer. */ #define LEAST_VALID 10U /* 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/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index 339b56e23f..1a5c6b116b 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/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/mvme167/timer/timer.c b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c index 844f9fda84..55f14b1e23 100644 --- a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c @@ -31,6 +31,7 @@ */ #include <rtems.h> +#include <rtems/btimer.h> #include <bsp.h> /* Periodic tick interval */ @@ -105,7 +106,7 @@ void benchmark_timer_initialize(void) * LEAST_VALID is the lowest number this routine should trust. Numbers * below this are "noise" and zero is returned. */ -int benchmark_timer_read(void) +uint32_t benchmark_timer_read(void) { uint32_t total; 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; diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog index a77644d1d8..c5a7573a77 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog +++ b/c/src/lib/libbsp/no_cpu/no_bsp/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/no_cpu/no_bsp/timer/timer.c b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c index 0fad1a9d26..8877c2e3f3 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c +++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c @@ -19,6 +19,7 @@ */ #include <rtems.h> +#include <rtems/btimer.h> #include <bsp.h> uint32_t Timer_interrupts; @@ -54,7 +55,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 ) { uint32_t clicks; uint32_t total; |