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/libbsp/no_cpu | |
| 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/libbsp/no_cpu')
| -rw-r--r-- | c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c index 78423b235b..e9b59dc756 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c +++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c @@ -53,7 +53,7 @@ void benchmark_timer_initialize( void ) /* This value is in microseconds. */ #define LEAST_VALID 1 /* Don't trust a clicks value lower than this */ -uint32_t benchmark_timer_read( void ) +benchmark_timer_t benchmark_timer_read( void ) { uint32_t clicks; uint32_t total; diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c index 961a16b2ec..5ca7152a54 100644 --- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c +++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c @@ -1,4 +1,5 @@ -/* timerisr.s +/** + * @file * * If required this ISR is used to bump a count of interval "overflow" * interrupts which have occurred since the timer was started. The @@ -9,10 +10,12 @@ * handler you can write. This should be the only interrupt which can * occur during the measured time period. * - * NOTE: This file is USUALLY in assembly and is LEAN AND MEAN. - * Any code in this isr is pure overhead which can perturb - * the accuracy of the Timing Test Suite. - * + * @note This file is USUALLY in assembly and is LEAN AND MEAN. + * Any code in this isr is pure overhead which can perturb + * the accuracy of the Timing Test Suite. + */ + +/* * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). * @@ -22,6 +25,7 @@ */ #include <rtems.h> +#include <rtems/btimer.h> extern uint32_t _Timer_interrupts; |