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 /testsuites/rhealstone | |
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 'testsuites/rhealstone')
-rw-r--r-- | testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c | 2 | ||||
-rw-r--r-- | testsuites/rhealstone/rhilatency/ilatency.c | 2 | ||||
-rw-r--r-- | testsuites/rhealstone/rhmlatency/mlatency.c | 2 | ||||
-rw-r--r-- | testsuites/rhealstone/rhsemshuffle/semshuffle.c | 2 | ||||
-rw-r--r-- | testsuites/rhealstone/rhtaskpreempt/taskpreempt.c | 2 | ||||
-rw-r--r-- | testsuites/rhealstone/rhtaskswitch/taskswitch.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c b/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c index 9ab620f567..a8977273c2 100644 --- a/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c +++ b/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c @@ -4,8 +4,8 @@ * This file's license is 2-clause BSD as in this distribution's LICENSE file. */ -#include <rtems/timerdrv.h> #include <timesys.h> +#include <rtems/btimer.h> const char rtems_test_name[] = "RHDEADLOCKBRK"; diff --git a/testsuites/rhealstone/rhilatency/ilatency.c b/testsuites/rhealstone/rhilatency/ilatency.c index a102b6a13b..0a7741bf28 100644 --- a/testsuites/rhealstone/rhilatency/ilatency.c +++ b/testsuites/rhealstone/rhilatency/ilatency.c @@ -15,8 +15,8 @@ #define CONFIGURE_INIT #include <timesys.h> +#include <rtems/btimer.h> #include <rtems/score/schedulerpriorityimpl.h> -#include <rtems/timerdrv.h> #include <coverhd.h> /* configuration information */ diff --git a/testsuites/rhealstone/rhmlatency/mlatency.c b/testsuites/rhealstone/rhmlatency/mlatency.c index 6495da5d46..11a29c0e2c 100644 --- a/testsuites/rhealstone/rhmlatency/mlatency.c +++ b/testsuites/rhealstone/rhmlatency/mlatency.c @@ -9,7 +9,7 @@ #endif #include <timesys.h> -#include <rtems/timerdrv.h> +#include <rtems/btimer.h> const char rtems_test_name[] = "RHMLATENCY"; diff --git a/testsuites/rhealstone/rhsemshuffle/semshuffle.c b/testsuites/rhealstone/rhsemshuffle/semshuffle.c index 4aafc52a26..6800926fec 100644 --- a/testsuites/rhealstone/rhsemshuffle/semshuffle.c +++ b/testsuites/rhealstone/rhsemshuffle/semshuffle.c @@ -4,8 +4,8 @@ * This file's license is 2-clause BSD as in this distribution's LICENSE file. */ -#include <rtems/timerdrv.h> #include <timesys.h> +#include <rtems/btimer.h> const char rtems_test_name[] = "RHSEMSHUFFLE"; diff --git a/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c b/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c index 137b58a133..090fd78d28 100644 --- a/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c +++ b/testsuites/rhealstone/rhtaskpreempt/taskpreempt.c @@ -5,7 +5,7 @@ */ #include <timesys.h> -#include <rtems/timerdrv.h> +#include <rtems/btimer.h> const char rtems_test_name[] = "RHTASKPREEMPT"; diff --git a/testsuites/rhealstone/rhtaskswitch/taskswitch.c b/testsuites/rhealstone/rhtaskswitch/taskswitch.c index 6096f18022..520de3374a 100644 --- a/testsuites/rhealstone/rhtaskswitch/taskswitch.c +++ b/testsuites/rhealstone/rhtaskswitch/taskswitch.c @@ -4,8 +4,8 @@ * This file's license is 2-clause BSD as in this distribution's LICENSE file. */ -#include <rtems/timerdrv.h> #include <timesys.h> +#include <rtems/btimer.h> #define BENCHMARKS 50000 |