diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-09-04 08:59:49 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-09-16 16:09:12 -0500 |
| commit | 8fbe2e69b544479feb5a361c6aebeae53eb827c8 (patch) | |
| tree | ad4e97466a3c29c6fd5f3505a8dbbb51558a3d33 /c/src/lib/libcpu/arm/pxa255 | |
| parent | or1k: New cache manager. (diff) | |
| download | rtems-8fbe2e69b544479feb5a361c6aebeae53eb827c8.tar.bz2 | |
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.
Diffstat (limited to 'c/src/lib/libcpu/arm/pxa255')
| -rw-r--r-- | c/src/lib/libcpu/arm/pxa255/timer/timer.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/c/src/lib/libcpu/arm/pxa255/timer/timer.c b/c/src/lib/libcpu/arm/pxa255/timer/timer.c index de555b4587..7eb3d5b811 100644 --- a/c/src/lib/libcpu/arm/pxa255/timer/timer.c +++ b/c/src/lib/libcpu/arm/pxa255/timer/timer.c @@ -1,23 +1,20 @@ +/** + * @file + * @brief PXA255 timer + */ + /* * PXA255 timer by Yang Xi <hiyangxi@gmail.com> * Copyright (c) 2004 by Jay Monkman <jtm@lopingdog.com> * - * Notes: - * This file manages the benchmark timer used by the RTEMS Timing Test - * Suite. Each measured time period is demarcated by calls to - * Timer_initialize() and Read_timer(). Read_timer() usually returns - * the number of microseconds since Timer_initialize() exitted. - * - * It is important that the timer start/stop overhead be determined - * when porting or modifying this code. - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.org/license/LICENSE. */ -#include <rtems.h> #include <bsp.h> +#include <rtems.h> +#include <rtems/btimer.h> #include <pxa255.h> uint32_t tstart; @@ -51,7 +48,7 @@ void benchmark_timer_initialize(void) /* This value is in microseconds. */ #define LEAST_VALID 1 /* Don't trust a clicks value lower than this */ -int benchmark_timer_read(void) +benchmark_timer_t benchmark_timer_read(void) { uint32_t total; |