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/powerpc/mpc6xx/timer/timer.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'c/src/lib/libcpu/powerpc/mpc6xx') diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c index fcd179aaa7..ee6e9a9659 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c +++ b/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c @@ -1,9 +1,11 @@ -/* timer.c +/** + * @file + * @brief * * This file implements a benchmark timer using the PPC Timebase - * - * Notes: NONE - * + */ + +/* * COPYRIGHT (c) 1989-2000. * On-Line Applications Research Corporation (OAR). * @@ -12,10 +14,11 @@ * http://www.rtems.org/license/LICENSE. */ +#include +#include #include +#include #include -#include -#include #include @@ -58,7 +61,7 @@ void benchmark_timer_initialize(void) * benchmark_timer_read */ -int benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint64_t total64; uint32_t total; -- cgit v1.2.3