From 8fbe2e69b544479feb5a361c6aebeae53eb827c8 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 4 Sep 2014 08:59:49 -0500 Subject: Use correct prototype of benchmark_timer_read() This change starts with removing the effectively empty file timerdrv.h. The prototypes for benchmark_timer_XXX() were in btimer.h which was not universally used. Thus every use of timerdrv.h had to be changed to btimer.h. Then the prototypes for benchmark_timer_read() had to be adjusted to return benchmark_timer_t rather than int or uint32_t. I took this opportunity to also correct the file headers to separate the copyright from the file description comments which is needed to ensure the copyright isn't propagated into Doxygen output. --- c/src/lib/libbsp/arm/raspberrypi/misc/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'c/src/lib/libbsp/arm/raspberrypi/misc/timer.c') diff --git a/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c b/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c index 7e83e4096d..e90af08290 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c +++ b/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c @@ -17,7 +17,7 @@ */ #include -#include +#include #include static bool benchmark_timer_find_average_overhead = false; @@ -29,7 +29,7 @@ void benchmark_timer_initialize(void) benchmark_timer_base = BCM2835_REG(BCM2835_GPU_TIMER_CLO); } -uint32_t benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t delta = BCM2835_REG(BCM2835_GPU_TIMER_CLO) - benchmark_timer_base; -- cgit v1.2.3