From 44d775307c3eff6072212046b40164bc5b6461db Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 9 Feb 2011 08:19:30 +0000 Subject: [PATCH] =?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 * shared/milkymist_timer/timer.c, shared/timer/timer.c: Include . Fix benchmark_timer_read() definition. --- c/src/lib/libbsp/lm32/ChangeLog | 6 ++++++ c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c | 3 ++- c/src/lib/libbsp/lm32/shared/timer/timer.c | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/c/src/lib/libbsp/lm32/ChangeLog b/c/src/lib/libbsp/lm32/ChangeLog index d95cd63959..e410712129 100644 --- a/c/src/lib/libbsp/lm32/ChangeLog +++ b/c/src/lib/libbsp/lm32/ChangeLog @@ -1,3 +1,9 @@ +2011-02-09 Ralf Corsépius + + * shared/milkymist_timer/timer.c, shared/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/lm32/shared/milkymist_timer/timer.c b/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c index d1af0dd382..bf9134fa75 100644 --- a/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c +++ b/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c @@ -21,6 +21,7 @@ #include #include +#include #include "../include/system_conf.h" #include "../../shared/clock/clock.h" @@ -58,7 +59,7 @@ void benchmark_timer_initialize( void ) /* This value is in microseconds. */ #define LEAST_VALID 4 /* Don't trust a clicks value lower than this */ -int benchmark_timer_read( void ) +uint32_t benchmark_timer_read( void ) { uint32_t ticks; uint32_t total; diff --git a/c/src/lib/libbsp/lm32/shared/timer/timer.c b/c/src/lib/libbsp/lm32/shared/timer/timer.c index 1ffc3653d8..99ec69f5f1 100644 --- a/c/src/lib/libbsp/lm32/shared/timer/timer.c +++ b/c/src/lib/libbsp/lm32/shared/timer/timer.c @@ -24,6 +24,7 @@ #include #include +#include #include "../include/system_conf.h" #include "../../shared/clock/clock.h" @@ -77,7 +78,7 @@ void benchmark_timer_initialize( void ) /* This value is in microseconds. */ #define LEAST_VALID 4 /* Don't trust a clicks value lower than this */ -int benchmark_timer_read( void ) +uint32_t benchmark_timer_read( void ) { uint32_t ticks; uint32_t total;