From d085040aef952f77797a4852e1e618eee1ede644 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 9 Feb 2011 08:38:15 +0000 Subject: =?UTF-8?q?2011-02-09=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * timer/timer.c: Include . Fix benchmark_timer_read() definition. --- c/src/lib/libbsp/i386/i386ex/ChangeLog | 5 +++++ c/src/lib/libbsp/i386/i386ex/timer/timer.c | 3 ++- c/src/lib/libbsp/i386/pc386/ChangeLog | 5 +++++ c/src/lib/libbsp/i386/pc386/timer/timer.c | 2 +- c/src/lib/libbsp/i386/ts_386ex/ChangeLog | 5 +++++ c/src/lib/libbsp/i386/ts_386ex/timer/timer.c | 3 ++- c/src/lib/libbsp/m32c/m32cbsp/ChangeLog | 5 +++++ c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c | 1 + c/src/lib/libbsp/m68k/av5282/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/av5282/timer/timer.c | 3 ++- c/src/lib/libbsp/m68k/gen68302/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/gen68302/timer/timer.c | 3 ++- c/src/lib/libbsp/m68k/gen68340/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/gen68340/timer/timer.c | 3 ++- c/src/lib/libbsp/m68k/ods68302/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/ods68302/timer/timer.c | 3 ++- c/src/lib/libbsp/m68k/uC5282/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/uC5282/timer/timer.c | 3 ++- c/src/lib/libbsp/powerpc/score603e/ChangeLog | 5 +++++ c/src/lib/libbsp/powerpc/score603e/timer/timer.c | 3 ++- c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog | 5 +++++ c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c | 5 +++-- 22 files changed, 76 insertions(+), 11 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog index d3c2338e4c..1ed3b7bc0f 100644 --- a/c/src/lib/libbsp/i386/i386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Ralf Corsépius + + * timer/timer.c: Include . + Fix benchmark_timer_read() definition. + 2011-02-02 Ralf Corsépius * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/i386/i386ex/timer/timer.c b/c/src/lib/libbsp/i386/i386ex/timer/timer.c index 00ff157628..c4c9390648 100644 --- a/c/src/lib/libbsp/i386/i386ex/timer/timer.c +++ b/c/src/lib/libbsp/i386/i386ex/timer/timer.c @@ -11,6 +11,7 @@ #include #include +#include #include int Ttimer_val; @@ -93,7 +94,7 @@ void benchmark_timer_initialize(void) /* (3 ticks) to start/stop the timer. */ #define LEAST_VALID 4 /* Don't trust a value lower than this */ -int benchmark_timer_read(void) +uint32_t benchmark_timer_read(void) { register uint32_t clicks; register uint32_t total; diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index 4b4c5a64fd..85c360491c 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Ralf Corsépius + + * timer/timer.c: Include . + Fix benchmark_timer_read() definition. + 2011-02-02 Ralf Corsépius * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/i386/pc386/timer/timer.c b/c/src/lib/libbsp/i386/pc386/timer/timer.c index 7853cbc610..f22f20ad94 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/timer.c +++ b/c/src/lib/libbsp/i386/pc386/timer/timer.c @@ -28,8 +28,8 @@ */ #include - #include +#include #include #include diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog index d07f9a5cd5..6b04f2d630 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Ralf Corsépius + + * timer/timer.c: Include . + Fix benchmark_timer_read() definition. + 2011-02-02 Ralf Corsépius * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c b/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c index 9eb3687848..be68f24185 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c +++ b/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c @@ -11,6 +11,7 @@ #include #include +#include #include volatile uint32_t Ttimer_val; /* Updated from ISR!!! */ @@ -119,7 +120,7 @@ void benchmark_timer_initialize(void) /* (3 ticks) to start/stop the timer. */ #define LEAST_VALID 4 /* Don't trust a value lower than this */ -int benchmark_timer_read(void) +uint32_t benchmark_timer_read(void) { register uint32_t clicks, total; register uint8_t lsb, msb; diff --git a/c/src/lib/libbsp/m32c/m32cbsp/ChangeLog b/c/src/lib/libbsp/m32c/m32cbsp/ChangeLog index 3980847a7d..e699bbd864 100644 --- a/c/src/lib/libbsp/m32c/m32cbsp/ChangeLog +++ b/c/src/lib/libbsp/m32c/m32cbsp/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Ralf Corsépius + + * timer/timer.c: Include . + Fix benchmark_timer_read() definition. + 2011-02-02 Ralf Corsépius * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c b/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c index 7a2ad7aa60..0982f76b98 100644 --- a/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c +++ b/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c @@ -10,6 +10,7 @@ */ #include +#include #include diff --git a/c/src/lib/libbsp/m68k/av5282/ChangeLog b/c/src/lib/libbsp/m68k/av5282/ChangeLog index 16d47fa713..ce7d4efafa 100644 --- a/c/src/lib/libbsp/m68k/av5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/av5282/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Ralf Corsépius + + * timer/timer.c: Include . + Fix benchmark_timer_read() definition. + 2011-02-02 Ralf Corsépius * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/m68k/av5282/timer/timer.c b/c/src/lib/libbsp/m68k/av5282/timer/timer.c index ba638cd17a..8a8323e547 100644 --- a/c/src/lib/libbsp/m68k/av5282/timer/timer.c +++ b/c/src/lib/libbsp/m68k/av5282/timer/timer.c @@ -5,6 +5,7 @@ */ #include +#include #include void @@ -21,7 +22,7 @@ benchmark_timer_initialize(void) /* * Return timer value in microsecond units */ -int +uint32_t benchmark_timer_read(void) { return MCF5282_TIMER3_DTCN; diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index 06708fe7d6..137ecaa141 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Ralf Corsépius + + * timer/timer.c: Include . + Fix benchmark_timer_read() definition. + 2011-02-02 Ralf Corsépius * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c index 998b5da54e..7099bb670a 100644 --- a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c @@ -11,6 +11,7 @@ #include #include +#include #include #define TMR2_VAL 0x071b /* Timer mode register @@ -65,7 +66,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 ) { uint16_t clicks; uint32_t total; diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index b1bb463b12..0ee944e8b8 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Ralf Corsépius + + * timer/timer.c: Include . + Fix benchmark_timer_read() definition. + 2011-02-02 Ralf Corsépius * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c index c14e85769a..df4ce25ca4 100644 --- a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -251,7 +252,7 @@ void benchmark_timer_initialize (void) Output parameters: - Description: Return timer value in microsecond units *****************************************************/ -int +uint32_t benchmark_timer_read (void) { /* there's CLOCK_SPEED / 16 micro seconds between two timer register decrement */ diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index d21e182467..b48f827b47 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Ralf Corsépius + + * timer/timer.c: Include . + Fix benchmark_timer_read() definition. + 2011-02-02 Ralf Corsépius * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c index 3b87450982..d8e60178ee 100644 --- a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c +++ b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c @@ -14,6 +14,7 @@ #include #include +#include #include #define TMR2_VAL 0x071b /* Timer mode register @@ -68,7 +69,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 ) { uint16_t clicks; uint32_t total; diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog index 1b21881f18..1eb24c1b29 100644 --- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Ralf Corsépius + + * timer/timer.c: Include . + Fix benchmark_timer_read() definition. + 2011-02-02 Ralf Corsépius * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/m68k/uC5282/timer/timer.c b/c/src/lib/libbsp/m68k/uC5282/timer/timer.c index 47c1b55a13..6a926438da 100644 --- a/c/src/lib/libbsp/m68k/uC5282/timer/timer.c +++ b/c/src/lib/libbsp/m68k/uC5282/timer/timer.c @@ -15,6 +15,7 @@ #include #include +#include void benchmark_timer_initialize(void) @@ -34,7 +35,7 @@ benchmark_timer_initialize(void) /* * Return timer value in microsecond units */ -int +uint32_t benchmark_timer_read(void) { return MCF5282_TIMER3_DTCN; diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index a4f8812a8b..3b72ce4896 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Ralf Corsépius + + * timer/timer.c: Include . + Fix benchmark_timer_read() definition. + 2011-02-02 Ralf Corsépius * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/powerpc/score603e/timer/timer.c b/c/src/lib/libbsp/powerpc/score603e/timer/timer.c index 5566f4dc9c..8fcdb97c15 100644 --- a/c/src/lib/libbsp/powerpc/score603e/timer/timer.c +++ b/c/src/lib/libbsp/powerpc/score603e/timer/timer.c @@ -20,6 +20,7 @@ #include #include +#include uint64_t Timer_driver_Start_time; @@ -43,7 +44,7 @@ void benchmark_timer_initialize() * benchmark_timer_read */ -int benchmark_timer_read() +uint32_t benchmark_timer_read() { uint64_t clicks; uint64_t total64; diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog index 0c1ab4d841..751010adcb 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog +++ b/c/src/lib/libbsp/powerpc/tqm8xx/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Ralf Corsépius + + * timer/timer.c: Include . + Fix benchmark_timer_read() definition. + 2011-02-02 Ralf Corsépius * configure.ac: Require autoconf-2.68, automake-1.11.1. diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c b/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c index b38feec17f..21cd564b7f 100644 --- a/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c +++ b/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c @@ -50,6 +50,7 @@ #include #include +#include #include bool benchmark_timer_find_average_overhead; @@ -86,9 +87,9 @@ benchmark_timer_initialize (void) /* * Return timer value in microsecond units */ -int benchmark_timer_read(void) +uint32_t benchmark_timer_read(void) { - int retval; + uint32_t retval; retval = *(uint32_t*)&m8xx.tcn1; retval = retval * 1000000LL / BSP_bus_frequency; return retval; -- cgit v1.2.3