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/mpc5xx/timer/timer.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'c/src/lib/libcpu/powerpc/mpc5xx') diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c index 699c8493e1..65deae961e 100644 --- a/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c +++ b/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c @@ -1,16 +1,13 @@ -/* timer.c +/** + * @file + * @brief Timer Driver for the PowerPC MPC5xx. * * This file manages the interval timer on the PowerPC MPC5xx. - * NOTE: This is not the PIT, but rather the RTEMS interval - * timer + * @noe This is not the PIT, but rather the RTEMS interval timer. * We shall use the bottom 32 bits of the timebase register, - * - * The following was in the 403 version of this file. I don't - * know what it means. JTM 5/19/98 - * NOTE: It is important that the timer start/stop overhead be - * determined when porting or modifying this code. - * - * + */ + +/* * MPC5xx port sponsored by Defence Research and Development Canada - Suffield * Copyright (C) 2004, Real-Time Systems Inc. (querbach@realtime.bc.ca) * @@ -47,6 +44,7 @@ */ #include +#include #include static volatile uint32_t Timer_starting; @@ -80,7 +78,7 @@ void benchmark_timer_initialize(void) Timer_starting = get_itimer(); } -int benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t clicks; uint32_t total; -- cgit v1.2.3