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/libcpu/sh/sh7045/timer/timer.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'c/src/lib/libcpu/sh/sh7045') diff --git a/c/src/lib/libcpu/sh/sh7045/timer/timer.c b/c/src/lib/libcpu/sh/sh7045/timer/timer.c index 86031cda61..152c99b1aa 100644 --- a/c/src/lib/libcpu/sh/sh7045/timer/timer.c +++ b/c/src/lib/libcpu/sh/sh7045/timer/timer.c @@ -1,14 +1,9 @@ +/** + * @file + * @brief Timer for the Hitachi SH 704X + */ + /* - * timer for the Hitachi SH 704X - * - * This file manages the benchmark timer used by the RTEMS Timing Test - * Suite. Each measured time period is demarcated by calls to - * benchmark_timer_initialize() and benchmark_timer_read(). benchmark_timer_read() usually returns - * the number of microseconds since benchmark_timer_initialize() exitted. - * - * NOTE: It is important that the timer start/stop overhead be - * determined when porting or modifying this code. - * * Authors: Ralf Corsepius (corsepiu@faw.uni-ulm.de) and * Bernd Becker (becker@faw.uni-ulm.de) * @@ -27,6 +22,7 @@ */ #include +#include #include #include @@ -143,7 +139,7 @@ void benchmark_timer_initialize( void ) /* This value is in microseconds. */ #define LEAST_VALID 0 /* 20 */ /* Don't trust a clicks value lower than this */ -int benchmark_timer_read( void ) +benchmark_timer_t benchmark_timer_read( void ) { uint32_t clicks; uint32_t total ; -- cgit v1.2.3