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/m68k/mcf5206/timer | |
| 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/m68k/mcf5206/timer')
| -rw-r--r-- | c/src/lib/libcpu/m68k/mcf5206/timer/timer.c | 12 | ||||
| -rw-r--r-- | c/src/lib/libcpu/m68k/mcf5206/timer/timerisr.S | 11 |
2 files changed, 15 insertions, 8 deletions
diff --git a/c/src/lib/libcpu/m68k/mcf5206/timer/timer.c b/c/src/lib/libcpu/m68k/mcf5206/timer/timer.c index a95521bb77..dbeebc80e0 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/timer/timer.c +++ b/c/src/lib/libcpu/m68k/mcf5206/timer/timer.c @@ -1,8 +1,11 @@ -/* - * Timer Init +/** + * @file + * @brief Timer Init * * This module initializes TIMER 2 for on the MCF5206E for benchmarks. - * + */ + +/* * Copyright (C) 2000 OKTET Ltd., St.-Petersburg, Russia * Author: Victor V. Vengerov <vvv@oktet.ru> * @@ -21,6 +24,7 @@ #include <rtems.h> #include <bsp.h> +#include <rtems/btimer.h> #include "mcf5206/mcf5206e.h" #define TRR2_VAL 65530 @@ -99,7 +103,7 @@ benchmark_timer_initialize(void) * RETURNS: * number of microseconds since timer has been started */ -int +benchmark_timer_t benchmark_timer_read( void ) { uint16_t clicks; diff --git a/c/src/lib/libcpu/m68k/mcf5206/timer/timerisr.S b/c/src/lib/libcpu/m68k/mcf5206/timer/timerisr.S index 2d4c5bc24d..bbcf6e2d6a 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/timer/timerisr.S +++ b/c/src/lib/libcpu/m68k/mcf5206/timer/timerisr.S @@ -1,5 +1,6 @@ -/* - * Handle MCF5206 TIMER2 interrupts. +/** + * @file + * @brief Handle MCF5206 TIMER2 interrupts * * All code in this routine is pure overhead which can perturb the * accuracy of RTEMS' timing test suite. @@ -11,7 +12,9 @@ * occur during the measured time period. * * An external counter, Timer_interrupts, is incremented. - * + */ + +/* * Copyright (C) 2000 OKTET Ltd., St.-Petersburg, Russia * Author: Victor V. Vengerov <vvv@oktet.ru> * @@ -29,7 +32,7 @@ */ #include <rtems/asm.h> -#include "bsp.h" +#include <bsp.h> #include "mcf5206/mcf5206e.h" BEGIN_CODE |