[PATCH 1/4] Use correct prototype of benchmark_timer_read()
Joel Sherrill
joel.sherrill at oarcorp.com
Thu Sep 11 13:28:14 UTC 2014
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/libbsp/arm/edb7312/timer/timer.c | 2 +-
c/src/lib/libbsp/arm/gba/timer/timer.c | 2 +-
.../arm/lpc176x/benchmark_timer/benchmark_timer.c | 4 +--
c/src/lib/libbsp/arm/lpc24xx/misc/timer.c | 3 +-
c/src/lib/libbsp/arm/lpc32xx/misc/timer.c | 3 +-
c/src/lib/libbsp/arm/raspberrypi/misc/timer.c | 4 +--
.../lib/libbsp/arm/tms570/clock/benchmark_timer.c | 3 +-
c/src/lib/libbsp/i386/pc386/timer/timer.c | 6 ++--
.../lib/libbsp/lm32/shared/milkymist_timer/timer.c | 2 +-
c/src/lib/libbsp/lm32/shared/timer/timer.c | 2 +-
c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c | 2 +-
c/src/lib/libbsp/m68k/gen68302/timer/timer.c | 2 +-
c/src/lib/libbsp/m68k/idp/timer/timer.c | 2 +-
c/src/lib/libbsp/m68k/mcf52235/timer/timer.c | 2 +-
c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c | 2 +-
c/src/lib/libbsp/m68k/mcf5329/timer/timer.c | 2 +-
c/src/lib/libbsp/m68k/mrm332/timer/timer.c | 2 +-
c/src/lib/libbsp/m68k/mvme136/timer/timer.c | 2 +-
c/src/lib/libbsp/m68k/mvme147/timer/timer.c | 2 +-
c/src/lib/libbsp/m68k/mvme162/timer/timer.c | 2 +-
c/src/lib/libbsp/m68k/mvme167/timer/timer.c | 34 ++++++++++++----------
c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S | 13 ++++-----
c/src/lib/libbsp/m68k/ods68302/timer/timer.c | 2 +-
c/src/lib/libbsp/mips/csb350/timer/timer.c | 2 +-
c/src/lib/libbsp/mips/genmongoosev/timer/timer.c | 2 +-
c/src/lib/libbsp/mips/jmr3904/timer/timer.c | 2 +-
c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c | 2 +-
c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c | 2 +-
c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c | 14 +++++----
c/src/lib/libbsp/or1k/or1ksim/timer/timer.c | 2 +-
c/src/lib/libbsp/powerpc/score603e/timer/timer.c | 2 +-
c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c | 2 +-
c/src/lib/libbsp/shared/timerstub.c | 2 +-
c/src/lib/libbsp/sparc/erc32/timer/timer.c | 2 +-
c/src/lib/libbsp/sparc/leon2/timer/timer.c | 2 +-
c/src/lib/libbsp/sparc/leon3/timer/timer.c | 2 +-
c/src/lib/libcpu/arm/at91rm9200/timer/timer.c | 25 +++++++---------
c/src/lib/libcpu/arm/lpc22xx/timer/timer.c | 34 ++++++++++------------
c/src/lib/libcpu/arm/mc9328mxl/timer/timer.c | 23 ++++++---------
c/src/lib/libcpu/arm/pxa255/timer/timer.c | 25 +++++++---------
c/src/lib/libcpu/arm/s3c24xx/timer/timer.c | 31 +++++++++-----------
c/src/lib/libcpu/bfin/timer/timer.c | 22 ++++++++------
c/src/lib/libcpu/m68k/mcf5206/timer/timer.c | 12 +++++---
c/src/lib/libcpu/m68k/mcf5206/timer/timerisr.S | 11 ++++---
c/src/lib/libcpu/m68k/mcf5272/timer/timer.c | 11 ++++---
c/src/lib/libcpu/m68k/mcf5272/timer/timerisr.S | 12 ++++----
c/src/lib/libcpu/mips/timer/timer.c | 30 +++++++------------
c/src/lib/libcpu/powerpc/mpc505/timer/timer.c | 15 ++++++----
c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c | 20 ++++++-------
c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c | 17 ++++++-----
c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c | 19 ++++++------
c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c | 18 ++++++------
c/src/lib/libcpu/powerpc/ppc403/timer/timer.c | 16 +++++-----
c/src/lib/libcpu/sh/sh7032/timer/timer.c | 18 +++++-------
c/src/lib/libcpu/sh/sh7045/timer/timer.c | 18 +++++-------
c/src/lib/libcpu/sh/sh7750/timer/timer.c | 18 +++++-------
cpukit/libcsupport/Makefile.am | 1 -
cpukit/libcsupport/include/timerdrv.h | 34 ----------------------
cpukit/libcsupport/preinstall.am | 4 ---
cpukit/sapi/include/confdefs.h | 2 +-
doc/bsp_howto/timer.t | 2 +-
testsuites/psxtmtests/psxtmbarrier01/init.c | 2 +-
testsuites/psxtmtests/psxtmbarrier02/init.c | 2 +-
testsuites/psxtmtests/psxtmbarrier03/init.c | 2 +-
testsuites/psxtmtests/psxtmbarrier04/init.c | 2 +-
testsuites/psxtmtests/psxtmcond01/init.c | 2 +-
testsuites/psxtmtests/psxtmcond02/init.c | 2 +-
testsuites/psxtmtests/psxtmcond03/init.c | 2 +-
testsuites/psxtmtests/psxtmcond04/init.c | 2 +-
testsuites/psxtmtests/psxtmcond05/init.c | 2 +-
testsuites/psxtmtests/psxtmcond06/init.c | 2 +-
testsuites/psxtmtests/psxtmcond07/init.c | 2 +-
testsuites/psxtmtests/psxtmcond08/init.c | 2 +-
testsuites/psxtmtests/psxtmkey01/init.c | 2 +-
testsuites/psxtmtests/psxtmkey02/init.c | 2 +-
testsuites/psxtmtests/psxtmmq01/init.c | 2 +-
testsuites/psxtmtests/psxtmmutex01/init.c | 2 +-
testsuites/psxtmtests/psxtmmutex02/init.c | 2 +-
testsuites/psxtmtests/psxtmmutex03/init.c | 2 +-
testsuites/psxtmtests/psxtmmutex04/init.c | 2 +-
testsuites/psxtmtests/psxtmmutex05/init.c | 2 +-
testsuites/psxtmtests/psxtmmutex06/init.c | 2 +-
testsuites/psxtmtests/psxtmmutex07/init.c | 2 +-
testsuites/psxtmtests/psxtmnanosleep01/init.c | 2 +-
testsuites/psxtmtests/psxtmnanosleep02/init.c | 2 +-
testsuites/psxtmtests/psxtmrwlock01/init.c | 2 +-
testsuites/psxtmtests/psxtmrwlock02/init.c | 2 +-
testsuites/psxtmtests/psxtmrwlock03/init.c | 2 +-
testsuites/psxtmtests/psxtmrwlock04/init.c | 2 +-
testsuites/psxtmtests/psxtmrwlock05/init.c | 2 +-
testsuites/psxtmtests/psxtmrwlock06/init.c | 2 +-
testsuites/psxtmtests/psxtmrwlock07/init.c | 2 +-
testsuites/psxtmtests/psxtmsem01/init.c | 2 +-
testsuites/psxtmtests/psxtmsem02/init.c | 2 +-
testsuites/psxtmtests/psxtmsem03/init.c | 2 +-
testsuites/psxtmtests/psxtmsem04/init.c | 2 +-
testsuites/psxtmtests/psxtmsem05/init.c | 2 +-
testsuites/psxtmtests/psxtmsleep01/init.c | 2 +-
testsuites/psxtmtests/psxtmsleep02/init.c | 2 +-
testsuites/psxtmtests/psxtmthread02/init.c | 2 +-
testsuites/psxtmtests/psxtmthread03/init.c | 2 +-
testsuites/psxtmtests/psxtmthread04/init.c | 2 +-
testsuites/psxtmtests/psxtmthread05/init.c | 2 +-
testsuites/psxtmtests/psxtmthread06/init.c | 2 +-
testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c | 2 +-
testsuites/rhealstone/rhilatency/ilatency.c | 2 +-
testsuites/rhealstone/rhmlatency/mlatency.c | 2 +-
testsuites/rhealstone/rhsemshuffle/semshuffle.c | 2 +-
testsuites/rhealstone/rhtaskpreempt/taskpreempt.c | 2 +-
testsuites/rhealstone/rhtaskswitch/taskswitch.c | 2 +-
testsuites/support/src/tmtests_support.c | 4 +--
111 files changed, 309 insertions(+), 369 deletions(-)
delete mode 100644 cpukit/libcsupport/include/timerdrv.h
diff --git a/c/src/lib/libbsp/arm/edb7312/timer/timer.c b/c/src/lib/libbsp/arm/edb7312/timer/timer.c
index c17ee5a..b795122 100644
--- a/c/src/lib/libbsp/arm/edb7312/timer/timer.c
+++ b/c/src/lib/libbsp/arm/edb7312/timer/timer.c
@@ -46,7 +46,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 )
{
uint16_t t;
uint32_t total;
diff --git a/c/src/lib/libbsp/arm/gba/timer/timer.c b/c/src/lib/libbsp/arm/gba/timer/timer.c
index 058dfcb..9aad103 100644
--- a/c/src/lib/libbsp/arm/gba/timer/timer.c
+++ b/c/src/lib/libbsp/arm/gba/timer/timer.c
@@ -94,7 +94,7 @@ void benchmark_timer_initialize( void )
* @param None
* @return Timer value in microseconds
*/
-uint32_t benchmark_timer_read( void )
+benchmark_timer_t benchmark_timer_read( void )
{
uint32_t ticks;
uint32_t total;
diff --git a/c/src/lib/libbsp/arm/lpc176x/benchmark_timer/benchmark_timer.c b/c/src/lib/libbsp/arm/lpc176x/benchmark_timer/benchmark_timer.c
index a8f2855..2aa4910 100644
--- a/c/src/lib/libbsp/arm/lpc176x/benchmark_timer/benchmark_timer.c
+++ b/c/src/lib/libbsp/arm/lpc176x/benchmark_timer/benchmark_timer.c
@@ -32,7 +32,7 @@ void benchmark_timer_initialize( void )
benchmark_timer_base = lpc176x_timer_get_timer_value( LPC176X_TIMER_1 );
}
-uint32_t benchmark_timer_read( void )
+benchmark_timer_t benchmark_timer_read( void )
{
uint32_t delta = lpc176x_timer_get_timer_value( LPC176X_TIMER_1 ) -
benchmark_timer_base;
@@ -42,4 +42,4 @@ uint32_t benchmark_timer_read( void )
void benchmark_timer_disable_subtracting_average_overhead( bool find_avg_ovhead )
{
-}
\ No newline at end of file
+}
diff --git a/c/src/lib/libbsp/arm/lpc24xx/misc/timer.c b/c/src/lib/libbsp/arm/lpc24xx/misc/timer.c
index 8b4bc67..c700d04 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/misc/timer.c
+++ b/c/src/lib/libbsp/arm/lpc24xx/misc/timer.c
@@ -22,7 +22,6 @@
#include <rtems.h>
#include <bsp.h>
#include <rtems/btimer.h>
-#include <rtems/timerdrv.h>
#include <bsp/system-clocks.h>
@@ -35,7 +34,7 @@ void benchmark_timer_initialize(void)
benchmark_timer_base = lpc24xx_timer();
}
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t delta = lpc24xx_timer() - benchmark_timer_base;
diff --git a/c/src/lib/libbsp/arm/lpc32xx/misc/timer.c b/c/src/lib/libbsp/arm/lpc32xx/misc/timer.c
index 3edae37..5079452 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/misc/timer.c
+++ b/c/src/lib/libbsp/arm/lpc32xx/misc/timer.c
@@ -21,7 +21,6 @@
#include <rtems.h>
#include <rtems/btimer.h>
-#include <rtems/timerdrv.h>
#include <bsp.h>
@@ -32,7 +31,7 @@ void benchmark_timer_initialize(void)
benchmark_timer_base = lpc32xx_timer();
}
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
return lpc32xx_timer() - benchmark_timer_base;
}
diff --git a/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c b/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c
index 7e83e40..e90af08 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c
+++ b/c/src/lib/libbsp/arm/raspberrypi/misc/timer.c
@@ -17,7 +17,7 @@
*/
#include <rtems.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include <bsp/raspberrypi.h>
static bool benchmark_timer_find_average_overhead = false;
@@ -29,7 +29,7 @@ void benchmark_timer_initialize(void)
benchmark_timer_base = BCM2835_REG(BCM2835_GPU_TIMER_CLO);
}
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t delta = BCM2835_REG(BCM2835_GPU_TIMER_CLO) - benchmark_timer_base;
diff --git a/c/src/lib/libbsp/arm/tms570/clock/benchmark_timer.c b/c/src/lib/libbsp/arm/tms570/clock/benchmark_timer.c
index b45f0f4..a2a0304 100644
--- a/c/src/lib/libbsp/arm/tms570/clock/benchmark_timer.c
+++ b/c/src/lib/libbsp/arm/tms570/clock/benchmark_timer.c
@@ -28,7 +28,6 @@
#include <bsp.h>
#include <bsp/system-clocks.h>
#include <rtems/btimer.h>
-#include <rtems/timerdrv.h>
bool benchmark_timer_find_average_overhead = false;
@@ -39,7 +38,7 @@ void benchmark_timer_initialize(void)
benchmark_timer_base = _CPU_Counter_read();
}
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t delta = _CPU_Counter_read() - benchmark_timer_base;
diff --git a/c/src/lib/libbsp/i386/pc386/timer/timer.c b/c/src/lib/libbsp/i386/pc386/timer/timer.c
index 8c3235b..953db03 100644
--- a/c/src/lib/libbsp/i386/pc386/timer/timer.c
+++ b/c/src/lib/libbsp/i386/pc386/timer/timer.c
@@ -51,9 +51,9 @@ volatile uint32_t Ttimer_val;
bool benchmark_timer_find_average_overhead = true;
volatile unsigned int fastLoop1ms, slowLoop1ms;
-void (*benchmark_timer_initialize_function)(void) = 0;
-uint32_t (*benchmark_timer_read_function)(void) = 0;
-void (*Timer_exit_function)(void) = 0;
+void (*benchmark_timer_initialize_function)(void) = 0;
+benchmark_timer_t (*benchmark_timer_read_function)(void) = 0;
+void (*Timer_exit_function)(void) = 0;
/* timer (int 08h) Interrupt Service Routine (defined in 'timerisr.s') */
extern void timerisr(void);
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c b/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c
index 5eb0215..bba2eee 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c
+++ b/c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c
@@ -47,7 +47,7 @@ void benchmark_timer_initialize(void)
/* This value is in microseconds. */
#define LEAST_VALID 4 /* Don't trust a clicks value lower than this */
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t ticks;
uint32_t total;
diff --git a/c/src/lib/libbsp/lm32/shared/timer/timer.c b/c/src/lib/libbsp/lm32/shared/timer/timer.c
index 98eb576..aa39c1a 100644
--- a/c/src/lib/libbsp/lm32/shared/timer/timer.c
+++ b/c/src/lib/libbsp/lm32/shared/timer/timer.c
@@ -76,7 +76,7 @@ void benchmark_timer_initialize( void )
/* This value is in microseconds. */
#define LEAST_VALID 4 /* Don't trust a clicks value lower than this */
-uint32_t benchmark_timer_read( void )
+benchmark_timer_t benchmark_timer_read( void )
{
uint32_t ticks;
uint32_t total;
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c b/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c
index 5ce906c..0b5aa99 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c
+++ b/c/src/lib/libbsp/m32c/m32cbsp/timer/timer.c
@@ -41,7 +41,7 @@ void benchmark_timer_initialize(void)
TABSR = 0x55;
}
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t count;
diff --git a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c
index a942fe6..6749efc 100644
--- a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c
@@ -64,7 +64,7 @@ void benchmark_timer_initialize( void )
/*
* Return timer value in 1/2-microsecond units
*/
-uint32_t benchmark_timer_read( void )
+benchmark_timer_t benchmark_timer_read( void )
{
uint16_t clicks;
uint32_t total;
diff --git a/c/src/lib/libbsp/m68k/idp/timer/timer.c b/c/src/lib/libbsp/m68k/idp/timer/timer.c
index 0788e49..23ffff7 100644
--- a/c/src/lib/libbsp/m68k/idp/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/idp/timer/timer.c
@@ -49,7 +49,7 @@ void benchmark_timer_initialize(void)
#define AVG_OVERHEAD 9 /* may not be right -- do this later */
#define LEAST_VALID 10 /* Don't trust a value lower than this */
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint8_t data;
uint8_t msb, osb, lsb;
diff --git a/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c b/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c
index 9faed0d..f912254 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c
@@ -29,7 +29,7 @@ void benchmark_timer_initialize(void)
/*
* Return timer value in microsecond units
*/
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
return MCF_DTIM3_DTCN;
}
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c b/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c
index 19a9513..ac0ca6d 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mcf5225x/timer/timer.c
@@ -29,7 +29,7 @@ void benchmark_timer_initialize(void)
/*
* Return timer value in microsecond units
*/
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
return MCF_DTIM3_DTCN;
}
diff --git a/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c b/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c
index 6d3dc85..0f762c0 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c
@@ -29,7 +29,7 @@ void benchmark_timer_initialize(void)
/*
* Return timer value in microsecond units
*/
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
return MCF_DTIM3_DTCN;
}
diff --git a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c
index 71a2e48..8c14f8f 100644
--- a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c
@@ -38,7 +38,7 @@ void benchmark_timer_initialize( void )
/*
* Return timer value in 1/2-microsecond units
*/
-uint32_t benchmark_timer_read( void )
+benchmark_timer_t benchmark_timer_read( void )
{
uint32_t total;
total = 0;
diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
index d767e68..a445b71 100644
--- a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
@@ -50,7 +50,7 @@ void benchmark_timer_initialize(void)
/* (6 countdowns) to start/stop the timer. */
#define LEAST_VALID 10 /* Don't trust a value lower than this */
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
/*
uint8_t msb, lsb;
diff --git a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
index 98331c7..1db32c5 100644
--- a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
@@ -45,7 +45,7 @@ void benchmark_timer_initialize(void)
synchronized whith the counter updates*/
#define LEAST_VALID 10 /* Don't trust a value lower than this */
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t total;
uint16_t counter_value;
diff --git a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
index b8bdde8..579685c 100644
--- a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
@@ -50,7 +50,7 @@ void benchmark_timer_initialize(void)
/* (3 countdowns) to start/stop the timer. */
#define LEAST_VALID 10U /* Don't trust a value lower than this */
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t total;
diff --git a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c
index 556d7bf..3b5dad4 100644
--- a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c
@@ -1,22 +1,26 @@
-/* timer.c
+/**
+ * @file
*
- * This file manages the benchmark timer used by the RTEMS Timing Test Suite.
- * Each measured time period is demarcated by calls to benchmark_timer_initialize() and
- * benchmark_timer_read(). benchmark_timer_read() usually returns the number of microseconds
- * since benchmark_timer_initialize() exitted.
+ * This file manages the benchmark timer used by the RTEMS Timing Test Suite.
+ * Each measured time period is demarcated by calls to
+ * benchmark_timer_initialize() and benchmark_timer_read().
+ * benchmark_timer_read() usually returns the number of microseconds
+ * since benchmark_timer_initialize() exitted.
*
- * These functions are prototyped in rtems/c/src/lib/include/timerdrv.h and
- * must be implemented as part of the BSP.
+ * These functions are prototyped in rtems/btimer.h and
+ * must be implemented as part of the BSP.
*
- * This port does not allow the application to select which timer on the
- * MVME167 to use for the timer, nor does it allow the application to
- * configure the timer. The timer uses the VMEchip2 Tick Timer #1. This timer
- * is distinct from the clock, which uses Tick Timer #2 in the VMEchip2.
+ * This port does not allow the application to select which timer on the
+ * MVME167 to use for the timer, nor does it allow the application to
+ * configure the timer. The timer uses the VMEchip2 Tick Timer #1. This timer
+ * is distinct from the clock, which uses Tick Timer #2 in the VMEchip2.
*
- * All page references are to the MVME166/MVME167/MVME187 Single Board
- * Computer Programmer's Reference Guide (MVME187PG/D2) with the April 1993
+ * All page references are to the MVME166/MVME167/MVME187 Single Board
+ * Computer Programmer's Reference Guide (MVME187PG/D2) with the April 1993
* supplements/addenda (MVME187PG/D2A1).
- *
+ */
+
+/*
* COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR).
*
@@ -104,7 +108,7 @@ void benchmark_timer_initialize(void)
* LEAST_VALID is the lowest number this routine should trust. Numbers
* below this are "noise" and zero is returned.
*/
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t total;
diff --git a/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S b/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S
index d109c9c..d96f099 100644
--- a/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S
+++ b/c/src/lib/libbsp/m68k/mvme167/timer/timerisr.S
@@ -1,14 +1,13 @@
-/* timer_isr()
+/**
+ * @file
*
* This ISR is used to bump a count of interval "overflow" interrupts which
* have occurred since the timer was started. The number of overflows is taken
* into account in the benchmark_timer_read() routine.
- *
- * Input parameters: NONE
- *
- * Output parameters: NONE
- *
- * COPYRIGHT (c) 1989-1999.
+ */
+
+/*
+ * COPYRIGHT (c) 1989-2014.
* On-Line Applications Research Corporation (OAR).
*
* The license and distribution terms for this file may be
diff --git a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c
index f0afdfd..1e03015 100644
--- a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c
@@ -67,7 +67,7 @@ void benchmark_timer_initialize( void )
/*
* Return timer value in 1/2-microsecond units
*/
-uint32_t benchmark_timer_read( void )
+benchmark_timer_t benchmark_timer_read( void )
{
uint16_t clicks;
uint32_t total;
diff --git a/c/src/lib/libbsp/mips/csb350/timer/timer.c b/c/src/lib/libbsp/mips/csb350/timer/timer.c
index 8fe45e5..30dbfe8 100644
--- a/c/src/lib/libbsp/mips/csb350/timer/timer.c
+++ b/c/src/lib/libbsp/mips/csb350/timer/timer.c
@@ -29,7 +29,7 @@ void benchmark_timer_initialize(void)
#define LEAST_VALID 1 /* Don't trust a value lower than this */
/* tx39 simulator can count instructions. :) */
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t total;
uint32_t cnt;
diff --git a/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c b/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c
index c60779f..a956c4b 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c
+++ b/c/src/lib/libbsp/mips/genmongoosev/timer/timer.c
@@ -55,7 +55,7 @@ void benchmark_timer_initialize(void)
/* mongoose-v can count cycles. :) */
#include <rtems/bspIo.h>
-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/mips/jmr3904/timer/timer.c b/c/src/lib/libbsp/mips/jmr3904/timer/timer.c
index bce4d9d..ca97cd3 100644
--- a/c/src/lib/libbsp/mips/jmr3904/timer/timer.c
+++ b/c/src/lib/libbsp/mips/jmr3904/timer/timer.c
@@ -44,7 +44,7 @@ void benchmark_timer_initialize(void)
#define LEAST_VALID 1 /* Don't trust a value lower than this */
/* tx39 simulator can count instructions. :) */
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t total;
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c b/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c
index 744cba5..e37c821 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c
+++ b/c/src/lib/libbsp/nios2/nios2_iss/timer/timer.c
@@ -94,7 +94,7 @@ void benchmark_timer_initialize( void )
#define LEAST_VALID AVG_OVERHEAD /* Don't trust a value lower than this */
-uint32_t benchmark_timer_read( void )
+benchmark_timer_t benchmark_timer_read( void )
{
uint32_t timer_wraps;
uint32_t timer_snap;
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 78423b2..e9b59dc 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 961a16b..5ca7152 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;
diff --git a/c/src/lib/libbsp/or1k/or1ksim/timer/timer.c b/c/src/lib/libbsp/or1k/or1ksim/timer/timer.c
index ec3c33e..e5f3fd6 100644
--- a/c/src/lib/libbsp/or1k/or1ksim/timer/timer.c
+++ b/c/src/lib/libbsp/or1k/or1ksim/timer/timer.c
@@ -32,7 +32,7 @@ void benchmark_timer_initialize(void)
#define AVG_OVERHEAD 0
#define LEAST_VALID 1
-uint32_t benchmark_timer_read( void )
+benchmark_timer_t benchmark_timer_read( void )
{
uint64_t clicks;
uint64_t total;
diff --git a/c/src/lib/libbsp/powerpc/score603e/timer/timer.c b/c/src/lib/libbsp/powerpc/score603e/timer/timer.c
index fbe2b00..f1f1312 100644
--- a/c/src/lib/libbsp/powerpc/score603e/timer/timer.c
+++ b/c/src/lib/libbsp/powerpc/score603e/timer/timer.c
@@ -42,7 +42,7 @@ void benchmark_timer_initialize()
* benchmark_timer_read
*/
-uint32_t benchmark_timer_read()
+benchmark_timer_t benchmark_timer_read()
{
uint64_t clicks;
uint64_t total64;
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c b/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c
index 10d8568..06c43c5 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/timer/timer.c
@@ -85,7 +85,7 @@ benchmark_timer_initialize (void)
/*
* Return timer value in microsecond units
*/
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t retval;
retval = *(uint32_t*)&m8xx.tcn1;
diff --git a/c/src/lib/libbsp/shared/timerstub.c b/c/src/lib/libbsp/shared/timerstub.c
index 50e3e44..d1e3313 100644
--- a/c/src/lib/libbsp/shared/timerstub.c
+++ b/c/src/lib/libbsp/shared/timerstub.c
@@ -15,7 +15,7 @@ void benchmark_timer_initialize(void)
{
}
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
if (benchmark_timer_find_average_overhead)
return 1;
diff --git a/c/src/lib/libbsp/sparc/erc32/timer/timer.c b/c/src/lib/libbsp/sparc/erc32/timer/timer.c
index c6772e5..4cf638e 100644
--- a/c/src/lib/libbsp/sparc/erc32/timer/timer.c
+++ b/c/src/lib/libbsp/sparc/erc32/timer/timer.c
@@ -62,7 +62,7 @@ void benchmark_timer_initialize(void)
#define LEAST_VALID 13 /* Don't trust a value lower than this */
#endif
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t total;
diff --git a/c/src/lib/libbsp/sparc/leon2/timer/timer.c b/c/src/lib/libbsp/sparc/leon2/timer/timer.c
index 0cbe0bf..de115c9 100644
--- a/c/src/lib/libbsp/sparc/leon2/timer/timer.c
+++ b/c/src/lib/libbsp/sparc/leon2/timer/timer.c
@@ -58,7 +58,7 @@ void benchmark_timer_initialize(void)
/* to start/stop the timer. */
#define LEAST_VALID 2 /* Don't trust a value lower than this */
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t total;
diff --git a/c/src/lib/libbsp/sparc/leon3/timer/timer.c b/c/src/lib/libbsp/sparc/leon3/timer/timer.c
index e7aa7f3..40bdeb8 100644
--- a/c/src/lib/libbsp/sparc/leon3/timer/timer.c
+++ b/c/src/lib/libbsp/sparc/leon3/timer/timer.c
@@ -57,7 +57,7 @@ void benchmark_timer_initialize(void)
/* to start/stop the timer. */
#define LEAST_VALID 2 /* Don't trust a value lower than this */
-uint32_t benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t total;
diff --git a/c/src/lib/libcpu/arm/at91rm9200/timer/timer.c b/c/src/lib/libcpu/arm/at91rm9200/timer/timer.c
index 2ae7bb6..c65dd80 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/timer/timer.c
+++ b/c/src/lib/libcpu/arm/at91rm9200/timer/timer.c
@@ -1,26 +1,21 @@
-/*
- * Cogent CSB337 Timer driver
+/**
+ * @file
+ * @brief Cogent CSB337 Timer driver
*
* This uses timer 0 for timing measurments.
- *
- * Copyright (c) 2004 by Jay Monkman <jtm at lopingdog.com>
+ */
+
+/*
+ * Copyright (c) 2004 by Jay Monkman <jtm at lopingdog.com>
*
* 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.
- *
- * Notes:
- * This file manages the benchmark timer used by the RTEMS Timing Test
- * Suite. Each measured time period is demarcated by calls to
- * benchmark_timer_initialize() and benchmark_timer_read(). benchmark_timer_read() usually returns
- * the number of microseconds since benchmark_timer_initialize() exitted.
- *
- * It is important that the timer start/stop overhead be determined
- * when porting or modifying this code.
*/
-#include <rtems.h>
#include <bsp.h>
+#include <rtems.h>
+#include <rtems/btimer.h>
#include <at91rm9200.h>
#include <at91rm9200_pmc.h>
@@ -63,7 +58,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 )
{
uint16_t t;
uint32_t total;
diff --git a/c/src/lib/libcpu/arm/lpc22xx/timer/timer.c b/c/src/lib/libcpu/arm/lpc22xx/timer/timer.c
index 10449ee..ad73aed 100644
--- a/c/src/lib/libcpu/arm/lpc22xx/timer/timer.c
+++ b/c/src/lib/libcpu/arm/lpc22xx/timer/timer.c
@@ -1,28 +1,24 @@
-/*
- * RTL22xx board Timer driver
+/**
+ * @file
+ * @brief RTL22xx board Timer driver
*
* This uses Timer1 for timing measurments.
+ */
+
+/*
+ * By Ray Xu <rayx.cn at gmail.com>, modify form Mc9328mxl RTEMS DSP
*
- * By Ray xu<rayx.cn at gmail.com>, modify form Mc9328mxl RTEMS DSP
- *
- * 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.
- *
- * Notes:
- * This file manages the benchmark timer used by the RTEMS Timing Test
- * Suite. Each measured time period is demarcated by calls to
- * benchmark_timer_initialize() and benchmark_timer_read(). benchmark_timer_read() usually returns
- * the number of microseconds since benchmark_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.
+ */
-#include <rtems.h>
#include <bsp.h>
+#include <rtems.h>
+#include <rtems/btimer.h>
#include <lpc22xx.h>
#include "lpc_timer.h"
+
uint32_t g_start;
uint32_t g_freq;
@@ -52,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 )
{
return (T0TC/(LPC22xx_Fpclk/1000000));
/*
diff --git a/c/src/lib/libcpu/arm/mc9328mxl/timer/timer.c b/c/src/lib/libcpu/arm/mc9328mxl/timer/timer.c
index 4ddd289..66ff4a0 100644
--- a/c/src/lib/libcpu/arm/mc9328mxl/timer/timer.c
+++ b/c/src/lib/libcpu/arm/mc9328mxl/timer/timer.c
@@ -1,27 +1,22 @@
-/*
- * Cogent CSB336 Timer driver
+/**
+ * @file
+ * @brief Cogent CSB336 Timer driver
*
* This uses timer 2 for timing measurments.
- *
+ */
+
+/*
* Copyright (c) 2004 Cogent Computer Systems
* Written by Jay Monkman <jtm at lopingdog.com>
*
* 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.
- *
- * Notes:
- * This file manages the benchmark timer used by the RTEMS Timing Test
- * Suite. Each measured time period is demarcated by calls to
- * benchmark_timer_initialize() and benchmark_timer_read(). benchmark_timer_read() usually returns
- * the number of microseconds since benchmark_timer_initialize() exitted.
- *
- * It is important that the timer start/stop overhead be determined
- * when porting or modifying this code.
-*/
+ */
#include <rtems.h>
#include <bsp.h>
+#include <rtems/btimer.h>
#include <mc9328mxl.h>
uint32_t g_start;
@@ -62,7 +57,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 t;
unsigned long long total;
diff --git a/c/src/lib/libcpu/arm/pxa255/timer/timer.c b/c/src/lib/libcpu/arm/pxa255/timer/timer.c
index de555b4..7eb3d5b 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 at gmail.com>
* Copyright (c) 2004 by Jay Monkman <jtm at 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;
diff --git a/c/src/lib/libcpu/arm/s3c24xx/timer/timer.c b/c/src/lib/libcpu/arm/s3c24xx/timer/timer.c
index 6166c74..2bc599d 100644
--- a/c/src/lib/libcpu/arm/s3c24xx/timer/timer.c
+++ b/c/src/lib/libcpu/arm/s3c24xx/timer/timer.c
@@ -1,24 +1,19 @@
-/*
- * S3C2400 Timer driver
+/**
+ * @file
+ * @brief S3C2400 Timer driver
*
* This uses timer 1 for timing measurments.
- *
- * 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.
- *
- * Notes:
- * This file manages the benchmark timer used by the RTEMS Timing Test
- * Suite. Each measured time period is demarcated by calls to
- * benchmark_timer_initialize() and benchmark_timer_read(). benchmark_timer_read() usually returns
- * the number of microseconds since benchmark_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.
+ */
-#include <rtems.h>
#include <bsp.h>
+#include <rtems.h>
+#include <rtems/btimer.h>
#include <s3c24xx.h>
uint32_t g_start;
@@ -69,7 +64,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 t;
unsigned long long total;
diff --git a/c/src/lib/libcpu/bfin/timer/timer.c b/c/src/lib/libcpu/bfin/timer/timer.c
index a5155f5..02540fe 100644
--- a/c/src/lib/libcpu/bfin/timer/timer.c
+++ b/c/src/lib/libcpu/bfin/timer/timer.c
@@ -1,10 +1,15 @@
-/* Timer for Blackfin
+/**
+ * @file
+ * @brief Timer for Blackfin
*
* This file manages the benchmark timer used by the RTEMS Timing Test
* Suite. Each measured time period is demarcated by calls to
- * benchmark_timer_initialize() and benchmark_timer_read(). benchmark_timer_read() usually returns
- * the number of microseconds since benchmark_timer_initialize() exitted.
- *
+ * benchmark_timer_initialize() and benchmark_timer_read().
+ * benchmark_timer_read() usually returns the number of microseconds
+ * since benchmark_timer_initialize() exitted.
+ */
+
+/*
* Copyright (c) 2006 by Atos Automacao Industrial Ltda.
* written by Alain Schaefer <alain.schaefer at easc.ch>
* and Antonio Giovanini <antonio at atos.com.br>
@@ -14,13 +19,12 @@
* http://www.rtems.org/license/LICENSE.
*/
-
#include <rtems.h>
#include <bsp.h>
+#include <rtems/btimer.h>
-
-uint32_t Timer_interrupts;
-bool benchmark_timer_find_average_overhead;
+uint32_t Timer_interrupts;
+bool benchmark_timer_find_average_overhead;
/*
* benchmark_timer_initialize
@@ -56,7 +60,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 clicks;
uint32_t total;
diff --git a/c/src/lib/libcpu/m68k/mcf5206/timer/timer.c b/c/src/lib/libcpu/m68k/mcf5206/timer/timer.c
index a95521b..dbeebc8 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 at 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 2d4c5bc..bbcf6e2 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 at oktet.ru>
*
@@ -29,7 +32,7 @@
*/
#include <rtems/asm.h>
-#include "bsp.h"
+#include <bsp.h>
#include "mcf5206/mcf5206e.h"
BEGIN_CODE
diff --git a/c/src/lib/libcpu/m68k/mcf5272/timer/timer.c b/c/src/lib/libcpu/m68k/mcf5272/timer/timer.c
index 0788456..812310f 100644
--- a/c/src/lib/libcpu/m68k/mcf5272/timer/timer.c
+++ b/c/src/lib/libcpu/m68k/mcf5272/timer/timer.c
@@ -1,8 +1,10 @@
-/*
- * Timer Init
+/**
+ * @file
*
* This module initializes TIMER 2 for on the MCF5272 for benchmarks.
- *
+ */
+
+/*
* Copyright (C) 2000 OKTET Ltd., St.-Petersburg, Russia
* Author: Victor V. Vengerov <vvv at oktet.ru>
*
@@ -22,6 +24,7 @@
#include <rtems.h>
#include <bsp.h>
#include <mcf5272/mcf5272.h>
+#include <rtems/btimer.h>
#define TRR2_VAL 65530
@@ -102,7 +105,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/mcf5272/timer/timerisr.S b/c/src/lib/libcpu/m68k/mcf5272/timer/timerisr.S
index 2e36c34..b9c2892 100644
--- a/c/src/lib/libcpu/m68k/mcf5272/timer/timerisr.S
+++ b/c/src/lib/libcpu/m68k/mcf5272/timer/timerisr.S
@@ -1,5 +1,6 @@
-/*
- * Handle MCF5272 TIMER2 interrupts.
+/**
+ * @file
+ * @brief Handle MCF5272 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 at oktet.ru>
*
@@ -30,9 +33,6 @@
#include <rtems/asm.h>
#include <bsp.h>
-/*
-#include "mcf5272/mcf5272.h"
-*/
BEGIN_CODE
PUBLIC(timerisr)
diff --git a/c/src/lib/libcpu/mips/timer/timer.c b/c/src/lib/libcpu/mips/timer/timer.c
index 4cb66e3..da5291a 100644
--- a/c/src/lib/libcpu/mips/timer/timer.c
+++ b/c/src/lib/libcpu/mips/timer/timer.c
@@ -1,7 +1,12 @@
-/* timer.c
- *
- * This file contains the initialization code for the IDT 4650 timer driver.
+/**
+ * @file
+ * @brief IDT 4650 Timer Driver.
*
+ * This file manages the benchmark timer used by the RTEMS Timing Test
+ * Suite.
+ */
+
+/*
* Author: Craig Lebakken <craigl at transition.com>
*
* COPYRIGHT (c) 1996 by Transition Networks Inc.
@@ -19,14 +24,6 @@
*
* derived from src/lib/libbsp/no_cpu/no_bsp/timer/timer.c
*
- * This file manages the benchmark timer used by the RTEMS Timing Test
- * Suite. Each measured time period is demarcated by calls to
- * benchmark_timer_initialize() and benchmark_timer_read(). benchmark_timer_read() usually returns
- * the number of microseconds since benchmark_timer_initialize() exitted.
- *
- * NOTE: It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
* COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR).
*
@@ -35,15 +32,8 @@
* http://www.rtems.org/license/LICENSE.
*/
-/*
- * Rather than deleting this, it is commented out to (hopefully) help
- * the submitter send updates.
- *
- * static char _sccsid[] = "@(#)timer.c 08/20/96 1.5\n";
- */
-
-
#include <rtems.h>
+#include <rtems/btimer.h>
#define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ )
#define TIMER_MAX_VALUE 0xffffffff
@@ -78,7 +68,7 @@ void benchmark_timer_initialize( void )
/* This value is in cycles. */
#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 )
{
uint64_t clicks;
uint32_t total;
diff --git a/c/src/lib/libcpu/powerpc/mpc505/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc505/timer/timer.c
index b353be4..17bc2af 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/timer/timer.c
+++ b/c/src/lib/libcpu/powerpc/mpc505/timer/timer.c
@@ -1,18 +1,23 @@
-/* timer.c
+/**
+ * @file
*
* This file manages the benchmark timer used by the RTEMS Timing Test
* Suite. Each measured time period is demarcated by calls to
- * benchmark_timer_initialize() and benchmark_timer_read(). benchmark_timer_read() usually returns
- * the number of microseconds since benchmark_timer_initialize() exitted.
+ * benchmark_timer_initialize() and benchmark_timer_read().
+ * benchmark_timer_read() usually returns the number of microseconds
+ * since benchmark_timer_initialize() exitted.
*
* NOTE: It is important that the timer start/stop overhead be
* determined when porting or modifying this code.
- *
+ */
+
+/*
* COPYRIGHT (c) 1989, 1990, 1991, 1992, 1993, 1994.
* On-Line Applications Research Corporation (OAR).
*/
#include <rtems.h>
+#include <rtems/btimer.h>
bool benchmark_timer_find_average_overhead;
@@ -38,7 +43,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 value;
__asm__ volatile ( " mftb %0": "=r" (value) );
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c
index 699c849..65deae9 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 at realtime.bc.ca)
*
@@ -47,6 +44,7 @@
*/
#include <rtems.h>
+#include <rtems/btimer.h>
#include <mpc5xx.h>
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;
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c
index fcd179a..ee6e9a9 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c
@@ -1,9 +1,11 @@
-/* timer.c
+/**
+ * @file
+ * @brief
*
* This file implements a benchmark timer using the PPC Timebase
- *
- * Notes: NONE
- *
+ */
+
+/*
* COPYRIGHT (c) 1989-2000.
* On-Line Applications Research Corporation (OAR).
*
@@ -12,10 +14,11 @@
* http://www.rtems.org/license/LICENSE.
*/
+#include <bsp.h>
+#include <rtems.h>
#include <rtems/system.h>
+#include <rtems/btimer.h>
#include <assert.h>
-#include <rtems.h>
-#include <bsp.h>
#include <libcpu/powerpc-utility.h>
@@ -58,7 +61,7 @@ void benchmark_timer_initialize(void)
* benchmark_timer_read
*/
-int benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint64_t total64;
uint32_t total;
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c
index 85b3630..c20fdc5 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c
+++ b/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c
@@ -1,15 +1,13 @@
-/* timer.c
+/**
+ * @file
+ * @brief Timer for the PowerPC MPC860
*
- * This file manages the interval timer on the PowerPC MPC860.
- * NOTE: 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.
- *
+ * @note This is not the PIT, but rather the RTEMS interval timer.
+ */
+
+/*
* Author: Andy Dachs <a.dachs at sstl.co.uk>
* Surrey Satellite Technlogy Limited
* Modified for MPC8260
@@ -46,6 +44,7 @@
*/
#include <rtems.h>
+#include <rtems/btimer.h>
#include <mpc8260.h>
static volatile uint32_t Timer_starting;
@@ -78,7 +77,7 @@ void benchmark_timer_initialize(void)
extern uint32_t bsp_timer_least_valid;
extern uint32_t bsp_timer_average_overhead;
-int benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t clicks;
uint32_t total;
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c
index 7d4ed1d..b82d764 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c
@@ -1,15 +1,14 @@
-/* timer.c
+/**
+ * @file
+ * @brief Timer Driver for the PowerPC MPC8xx.
*
* This file manages the interval timer on the PowerPC MPC8xx.
- * NOTE: 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.
- *
+ * @note This is not the PIT, but rather the RTEMS interval timer
+ */
+
+/*
* Author: Jay Monkman (jmonkman at frasca.com)
* Copywright (C) 1998 by Frasca International, Inc.
*
@@ -41,6 +40,7 @@
*/
#include <rtems.h>
+#include <rtems/btimer.h>
#include <mpc8xx.h>
static volatile uint32_t Timer_starting;
@@ -69,7 +69,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;
diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c b/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c
index 5ee5ff4..f883fac 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c
+++ b/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c
@@ -1,12 +1,13 @@
-/* timer.c
+/**
+ * @file
+ * @brief Timer Driver for the PowerPC 405.
*
* This file manages the interval timer on the PowerPC 405.
* We shall use the bottom 32 bits of the timebase register,
- *
- * NOTE: It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
- * Author: Andrew Bray <andy at i-cubed.co.uk>
+ */
+
+/*
+ * Author: Andrew Bray <andy at i-cubed.co.uk>
*
* COPYRIGHT (c) 1995 by i-cubed ltd.
*
@@ -37,6 +38,7 @@
*/
#include <rtems.h>
+#include <rtems/btimer.h>
#include <libcpu/powerpc-utility.h>
extern uint32_t bsp_timer_least_valid;
@@ -51,7 +53,7 @@ void benchmark_timer_initialize(void)
startedAt = ppc_time_base();
}
-int benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
{
uint32_t clicks, total;
diff --git a/c/src/lib/libcpu/sh/sh7032/timer/timer.c b/c/src/lib/libcpu/sh/sh7032/timer/timer.c
index f9750ad..94a834c 100644
--- a/c/src/lib/libcpu/sh/sh7032/timer/timer.c
+++ b/c/src/lib/libcpu/sh/sh7032/timer/timer.c
@@ -1,14 +1,9 @@
+/**
+ * @file
+ * @brief Timer for the Hitachi SH 703X
+ */
+
/*
- * timer for the Hitachi SH 703X
- *
- * This file manages the benchmark timer used by the RTEMS Timing Test
- * Suite. Each measured time period is demarcated by calls to
- * benchmark_timer_initialize() and benchmark_timer_read(). benchmark_timer_read() usually returns
- * the number of microseconds since benchmark_timer_initialize() exitted.
- *
- * NOTE: It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
* Authors: Ralf Corsepius (corsepiu at faw.uni-ulm.de) and
* Bernd Becker (becker at faw.uni-ulm.de)
*
@@ -27,6 +22,7 @@
*/
#include <rtems.h>
+#include <rtems/btimer.h>
#include <rtems/score/sh_io.h>
#include <rtems/score/ispsh7032.h>
@@ -147,7 +143,7 @@ void benchmark_timer_initialize( void )
/* This value is in microseconds. */
#define LEAST_VALID 0 /* 20 */ /* Don't trust a clicks value lower than this */
-int benchmark_timer_read( void )
+benchmark_timer_t benchmark_timer_read( void )
{
uint32_t cclicks;
uint32_t total ;
diff --git a/c/src/lib/libcpu/sh/sh7045/timer/timer.c b/c/src/lib/libcpu/sh/sh7045/timer/timer.c
index 86031cd..152c99b 100644
--- a/c/src/lib/libcpu/sh/sh7045/timer/timer.c
+++ b/c/src/lib/libcpu/sh/sh7045/timer/timer.c
@@ -1,14 +1,9 @@
+/**
+ * @file
+ * @brief Timer for the Hitachi SH 704X
+ */
+
/*
- * timer for the Hitachi SH 704X
- *
- * This file manages the benchmark timer used by the RTEMS Timing Test
- * Suite. Each measured time period is demarcated by calls to
- * benchmark_timer_initialize() and benchmark_timer_read(). benchmark_timer_read() usually returns
- * the number of microseconds since benchmark_timer_initialize() exitted.
- *
- * NOTE: It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
* Authors: Ralf Corsepius (corsepiu at faw.uni-ulm.de) and
* Bernd Becker (becker at faw.uni-ulm.de)
*
@@ -27,6 +22,7 @@
*/
#include <rtems.h>
+#include <rtems/btimer.h>
#include <rtems/score/sh_io.h>
#include <rtems/score/iosh7045.h>
@@ -143,7 +139,7 @@ void benchmark_timer_initialize( void )
/* This value is in microseconds. */
#define LEAST_VALID 0 /* 20 */ /* Don't trust a clicks value lower than this */
-int benchmark_timer_read( void )
+benchmark_timer_t benchmark_timer_read( void )
{
uint32_t clicks;
uint32_t total ;
diff --git a/c/src/lib/libcpu/sh/sh7750/timer/timer.c b/c/src/lib/libcpu/sh/sh7750/timer/timer.c
index fcdf8f5..ef462c7 100644
--- a/c/src/lib/libcpu/sh/sh7750/timer/timer.c
+++ b/c/src/lib/libcpu/sh/sh7750/timer/timer.c
@@ -1,14 +1,9 @@
+/**
+ * @file
+ * @brief Timer driver for the Hitachi SH 7750
+ */
+
/*
- * timer driver for the Hitachi SH 7750
- *
- * This file manages the benchmark timer used by the RTEMS Timing Test
- * Suite. Each measured time period is demarcated by calls to
- * benchmark_timer_initialize() and benchmark_timer_read(). benchmark_timer_read() usually returns
- * the number of microseconds since benchmark_timer_initialize() exitted.
- *
- * NOTE: It is important that the timer start/stop overhead be
- * determined when porting or modifying this code.
- *
* Copyright (C) 2001 OKTET Ltd., St.-Petersburg, Russia
* Author: Victor V. Vengerov <vvv at oktet.ru>
*
@@ -21,6 +16,7 @@
*/
#include <rtems.h>
+#include <rtems/btimer.h>
#include <rtems/score/sh_io.h>
#include <rtems/score/iosh7750.h>
@@ -198,7 +194,7 @@ benchmark_timer_initialize(void)
* RETURNS:
* number of microseconds since timer has been started
*/
-int
+benchmark_timer_t
benchmark_timer_read(void)
{
uint32_t clicks;
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index 41de471..835f96e 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -12,7 +12,6 @@ include_rtems_HEADERS += include/iosupp.h
include_rtems_HEADERS += include/ringbuf.h
include_rtems_HEADERS += include/rtc.h
include_rtems_HEADERS += include/spurious.h
-include_rtems_HEADERS += include/timerdrv.h
include_rtems_HEADERS += include/vmeintr.h
## motorola
diff --git a/cpukit/libcsupport/include/timerdrv.h b/cpukit/libcsupport/include/timerdrv.h
deleted file mode 100644
index ec6028a..0000000
--- a/cpukit/libcsupport/include/timerdrv.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @file
- *
- * @brief Timer Driver for all Boards
- *
- * This file describes the Timer Driver for all boards.
- */
-
-/*
- *
- * COPYRIGHT (c) 1989-1999.
- * On-Line Applications Research Corporation (OAR).
- *
- * 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.
- */
-
-#ifndef _RTEMS_TIMERDRV_H
-#define _RTEMS_TIMERDRV_H
-
-#include <rtems/btimer.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Intentionally empty */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/cpukit/libcsupport/preinstall.am b/cpukit/libcsupport/preinstall.am
index eb68f50..c4286ba 100644
--- a/cpukit/libcsupport/preinstall.am
+++ b/cpukit/libcsupport/preinstall.am
@@ -46,10 +46,6 @@ $(PROJECT_INCLUDE)/rtems/spurious.h: include/spurious.h $(PROJECT_INCLUDE)/rtems
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/spurious.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/spurious.h
-$(PROJECT_INCLUDE)/rtems/timerdrv.h: include/timerdrv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/timerdrv.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/timerdrv.h
-
$(PROJECT_INCLUDE)/rtems/vmeintr.h: include/vmeintr.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/vmeintr.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/vmeintr.h
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index f821e04..7e7c310 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -1319,7 +1319,7 @@ const rtems_libio_helper rtems_fs_init_helper =
#endif
#ifdef CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER
- #include <rtems/timerdrv.h>
+ #include <rtems/btimer.h>
#endif
#ifdef CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER
diff --git a/doc/bsp_howto/timer.t b/doc/bsp_howto/timer.t
index d7cebc3..fdefd72 100644
--- a/doc/bsp_howto/timer.t
+++ b/doc/bsp_howto/timer.t
@@ -44,7 +44,7 @@ time units (typically microseconds) that have elapsed since the last
call to @code{benchmark_timer_initialize}.
@example
-int benchmark_timer_read(void)
+benchmark_timer_t benchmark_timer_read(void)
@{
stop time = read the hardware timer
if the subtract overhead feature is enabled
diff --git a/testsuites/psxtmtests/psxtmbarrier01/init.c b/testsuites/psxtmtests/psxtmbarrier01/init.c
index 059cd0c..690653f 100644
--- a/testsuites/psxtmtests/psxtmbarrier01/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier01/init.c
@@ -12,7 +12,7 @@
#endif
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
#include <pthread.h>
diff --git a/testsuites/psxtmtests/psxtmbarrier02/init.c b/testsuites/psxtmtests/psxtmbarrier02/init.c
index 9952f63..0506db9 100644
--- a/testsuites/psxtmtests/psxtmbarrier02/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier02/init.c
@@ -13,7 +13,7 @@
#include <timesys.h>
#include <tmacros.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
#include <pthread.h>
diff --git a/testsuites/psxtmtests/psxtmbarrier03/init.c b/testsuites/psxtmtests/psxtmbarrier03/init.c
index c8b4c1b..d81be08 100644
--- a/testsuites/psxtmtests/psxtmbarrier03/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier03/init.c
@@ -17,7 +17,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
const char rtems_test_name[] = "PSXTMBARRIER 03";
diff --git a/testsuites/psxtmtests/psxtmbarrier04/init.c b/testsuites/psxtmtests/psxtmbarrier04/init.c
index 65fe557..2fc3b76 100644
--- a/testsuites/psxtmtests/psxtmbarrier04/init.c
+++ b/testsuites/psxtmtests/psxtmbarrier04/init.c
@@ -15,7 +15,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
const char rtems_test_name[] = "PSXTMBARRIER 04";
diff --git a/testsuites/psxtmtests/psxtmcond01/init.c b/testsuites/psxtmtests/psxtmcond01/init.c
index c4dd630..6dd7ab1 100644
--- a/testsuites/psxtmtests/psxtmcond01/init.c
+++ b/testsuites/psxtmtests/psxtmcond01/init.c
@@ -17,7 +17,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
const char rtems_test_name[] = "PSXTMCOND 01";
diff --git a/testsuites/psxtmtests/psxtmcond02/init.c b/testsuites/psxtmtests/psxtmcond02/init.c
index 668bb43..cbbb799 100644
--- a/testsuites/psxtmtests/psxtmcond02/init.c
+++ b/testsuites/psxtmtests/psxtmcond02/init.c
@@ -13,7 +13,7 @@
#include <timesys.h>
#include <pthread.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
const char rtems_test_name[] = "PSXTMCOND 02";
diff --git a/testsuites/psxtmtests/psxtmcond03/init.c b/testsuites/psxtmtests/psxtmcond03/init.c
index 795c8d4..fdf2dfe 100644
--- a/testsuites/psxtmtests/psxtmcond03/init.c
+++ b/testsuites/psxtmtests/psxtmcond03/init.c
@@ -17,7 +17,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
const char rtems_test_name[] = "PSXTMCOND 03";
diff --git a/testsuites/psxtmtests/psxtmcond04/init.c b/testsuites/psxtmtests/psxtmcond04/init.c
index 2c16dfa..889cc99 100644
--- a/testsuites/psxtmtests/psxtmcond04/init.c
+++ b/testsuites/psxtmtests/psxtmcond04/init.c
@@ -17,7 +17,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
const char rtems_test_name[] = "PSXTMCOND 04";
diff --git a/testsuites/psxtmtests/psxtmcond05/init.c b/testsuites/psxtmtests/psxtmcond05/init.c
index ab15fc3..81b32d8 100644
--- a/testsuites/psxtmtests/psxtmcond05/init.c
+++ b/testsuites/psxtmtests/psxtmcond05/init.c
@@ -13,7 +13,7 @@
#include <timesys.h>
#include <pthread.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
const char rtems_test_name[] = "PSXTMCOND 05";
diff --git a/testsuites/psxtmtests/psxtmcond06/init.c b/testsuites/psxtmtests/psxtmcond06/init.c
index 91bef6c..4f86108 100644
--- a/testsuites/psxtmtests/psxtmcond06/init.c
+++ b/testsuites/psxtmtests/psxtmcond06/init.c
@@ -17,7 +17,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#define N 5
diff --git a/testsuites/psxtmtests/psxtmcond07/init.c b/testsuites/psxtmtests/psxtmcond07/init.c
index 11d2912..275eab3 100644
--- a/testsuites/psxtmtests/psxtmcond07/init.c
+++ b/testsuites/psxtmtests/psxtmcond07/init.c
@@ -17,7 +17,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#define N 1
diff --git a/testsuites/psxtmtests/psxtmcond08/init.c b/testsuites/psxtmtests/psxtmcond08/init.c
index 49ad0d7..8af9f9d 100644
--- a/testsuites/psxtmtests/psxtmcond08/init.c
+++ b/testsuites/psxtmtests/psxtmcond08/init.c
@@ -30,7 +30,7 @@
#include <sched.h>
#include <timesys.h>
#include <tmacros.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
#include <pthread.h>
diff --git a/testsuites/psxtmtests/psxtmkey01/init.c b/testsuites/psxtmtests/psxtmkey01/init.c
index 4b3681e..7430b15 100644
--- a/testsuites/psxtmtests/psxtmkey01/init.c
+++ b/testsuites/psxtmtests/psxtmkey01/init.c
@@ -12,7 +12,7 @@
#endif
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include <errno.h>
#include <pthread.h>
#include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmkey02/init.c b/testsuites/psxtmtests/psxtmkey02/init.c
index 4814ef0..fafb8f6 100644
--- a/testsuites/psxtmtests/psxtmkey02/init.c
+++ b/testsuites/psxtmtests/psxtmkey02/init.c
@@ -12,7 +12,7 @@
#endif
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include <errno.h>
#include <pthread.h>
#include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmmq01/init.c b/testsuites/psxtmtests/psxtmmq01/init.c
index ca80374..aacd968 100644
--- a/testsuites/psxtmtests/psxtmmq01/init.c
+++ b/testsuites/psxtmtests/psxtmmq01/init.c
@@ -13,7 +13,7 @@
#include <fcntl.h>
#include <timesys.h>
#include <errno.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
#include <tmacros.h>
#include <mqueue.h>
diff --git a/testsuites/psxtmtests/psxtmmutex01/init.c b/testsuites/psxtmtests/psxtmmutex01/init.c
index 8a72bf9..c8f6054 100644
--- a/testsuites/psxtmtests/psxtmmutex01/init.c
+++ b/testsuites/psxtmtests/psxtmmutex01/init.c
@@ -12,7 +12,7 @@
#endif
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include <errno.h>
#include <pthread.h>
#include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmmutex02/init.c b/testsuites/psxtmtests/psxtmmutex02/init.c
index b82d23d..3ae6276 100644
--- a/testsuites/psxtmtests/psxtmmutex02/init.c
+++ b/testsuites/psxtmtests/psxtmmutex02/init.c
@@ -17,7 +17,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
const char rtems_test_name[] = "PSXTMMUTEX 02";
diff --git a/testsuites/psxtmtests/psxtmmutex03/init.c b/testsuites/psxtmtests/psxtmmutex03/init.c
index 07f49a5..bad1f27 100644
--- a/testsuites/psxtmtests/psxtmmutex03/init.c
+++ b/testsuites/psxtmtests/psxtmmutex03/init.c
@@ -12,7 +12,7 @@
#endif
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include <errno.h>
#include <pthread.h>
#include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmmutex04/init.c b/testsuites/psxtmtests/psxtmmutex04/init.c
index a1a8aa2..e422763 100644
--- a/testsuites/psxtmtests/psxtmmutex04/init.c
+++ b/testsuites/psxtmtests/psxtmmutex04/init.c
@@ -13,7 +13,7 @@
#include <timesys.h>
#include <tmacros.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
#include <pthread.h>
diff --git a/testsuites/psxtmtests/psxtmmutex05/init.c b/testsuites/psxtmtests/psxtmmutex05/init.c
index d36e534..712b5cc 100644
--- a/testsuites/psxtmtests/psxtmmutex05/init.c
+++ b/testsuites/psxtmtests/psxtmmutex05/init.c
@@ -17,7 +17,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
const char rtems_test_name[] = "PSXTMMUTEX 05";
diff --git a/testsuites/psxtmtests/psxtmmutex06/init.c b/testsuites/psxtmtests/psxtmmutex06/init.c
index 047f063..2e8b82d 100644
--- a/testsuites/psxtmtests/psxtmmutex06/init.c
+++ b/testsuites/psxtmtests/psxtmmutex06/init.c
@@ -17,7 +17,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
const char rtems_test_name[] = "PSXTMMUTEX 06";
diff --git a/testsuites/psxtmtests/psxtmmutex07/init.c b/testsuites/psxtmtests/psxtmmutex07/init.c
index adee994..299f87d 100644
--- a/testsuites/psxtmtests/psxtmmutex07/init.c
+++ b/testsuites/psxtmtests/psxtmmutex07/init.c
@@ -12,7 +12,7 @@
#endif
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include <errno.h>
#include <pthread.h>
#include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmnanosleep01/init.c b/testsuites/psxtmtests/psxtmnanosleep01/init.c
index e86a5d1..eeb67c1 100644
--- a/testsuites/psxtmtests/psxtmnanosleep01/init.c
+++ b/testsuites/psxtmtests/psxtmnanosleep01/init.c
@@ -12,7 +12,7 @@
#endif
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
const char rtems_test_name[] = "PSXTMNANOSLEEP 01";
diff --git a/testsuites/psxtmtests/psxtmnanosleep02/init.c b/testsuites/psxtmtests/psxtmnanosleep02/init.c
index f932811..12f6b75 100644
--- a/testsuites/psxtmtests/psxtmnanosleep02/init.c
+++ b/testsuites/psxtmtests/psxtmnanosleep02/init.c
@@ -12,7 +12,7 @@
#endif
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
#include <pthread.h>
diff --git a/testsuites/psxtmtests/psxtmrwlock01/init.c b/testsuites/psxtmtests/psxtmrwlock01/init.c
index 2f99a19..0073e70 100644
--- a/testsuites/psxtmtests/psxtmrwlock01/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock01/init.c
@@ -12,7 +12,7 @@
#endif
#include <errno.h>
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include <pthread.h>
#include "test_support.h"
diff --git a/testsuites/psxtmtests/psxtmrwlock02/init.c b/testsuites/psxtmtests/psxtmrwlock02/init.c
index 1017c7c..4ce7fa5 100644
--- a/testsuites/psxtmtests/psxtmrwlock02/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock02/init.c
@@ -16,7 +16,7 @@
#include <tmacros.h>
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
const char rtems_test_name[] = "PSXTMRWLOCK 02";
diff --git a/testsuites/psxtmtests/psxtmrwlock03/init.c b/testsuites/psxtmtests/psxtmrwlock03/init.c
index 76b5db2..5fdf522 100644
--- a/testsuites/psxtmtests/psxtmrwlock03/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock03/init.c
@@ -16,7 +16,7 @@
#include <tmacros.h>
#include <sched.h>
#include <pthread.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
const char rtems_test_name[] = "PSXTMRWLOCK 03";
diff --git a/testsuites/psxtmtests/psxtmrwlock04/init.c b/testsuites/psxtmtests/psxtmrwlock04/init.c
index 1eb2236..8b1b45d 100644
--- a/testsuites/psxtmtests/psxtmrwlock04/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock04/init.c
@@ -16,7 +16,7 @@
#include <tmacros.h>
#include <sched.h>
#include <pthread.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
const char rtems_test_name[] = "PSXTMRWLOCK 04";
diff --git a/testsuites/psxtmtests/psxtmrwlock05/init.c b/testsuites/psxtmtests/psxtmrwlock05/init.c
index 95d0fd9..1ec86c0 100644
--- a/testsuites/psxtmtests/psxtmrwlock05/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock05/init.c
@@ -16,7 +16,7 @@
#include <tmacros.h>
#include <sched.h>
#include <pthread.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
const char rtems_test_name[] = "PSXTMRWLOCK 05";
diff --git a/testsuites/psxtmtests/psxtmrwlock06/init.c b/testsuites/psxtmtests/psxtmrwlock06/init.c
index b83bfdd..b74ac25 100644
--- a/testsuites/psxtmtests/psxtmrwlock06/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock06/init.c
@@ -17,7 +17,7 @@
#include <tmacros.h>
#include <timesys.h>
#include "test_support.h"
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
const char rtems_test_name[] = "PSXTMRWLOCK 06";
diff --git a/testsuites/psxtmtests/psxtmrwlock07/init.c b/testsuites/psxtmtests/psxtmrwlock07/init.c
index 2506755..9a77902 100644
--- a/testsuites/psxtmtests/psxtmrwlock07/init.c
+++ b/testsuites/psxtmtests/psxtmrwlock07/init.c
@@ -17,7 +17,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
const char rtems_test_name[] = "PSXTMRWLOCK 07";
diff --git a/testsuites/psxtmtests/psxtmsem01/init.c b/testsuites/psxtmtests/psxtmsem01/init.c
index 10a7730..4223a02 100644
--- a/testsuites/psxtmtests/psxtmsem01/init.c
+++ b/testsuites/psxtmtests/psxtmsem01/init.c
@@ -16,7 +16,7 @@
#include <semaphore.h>
#include <tmacros.h>
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
const char rtems_test_name[] = "PSXTMSEM 01";
diff --git a/testsuites/psxtmtests/psxtmsem02/init.c b/testsuites/psxtmtests/psxtmsem02/init.c
index 70871ec..4629ac5 100644
--- a/testsuites/psxtmtests/psxtmsem02/init.c
+++ b/testsuites/psxtmtests/psxtmsem02/init.c
@@ -16,7 +16,7 @@
#include <semaphore.h>
#include <tmacros.h>
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
const char rtems_test_name[] = "PSXTMSEM 02";
diff --git a/testsuites/psxtmtests/psxtmsem03/init.c b/testsuites/psxtmtests/psxtmsem03/init.c
index 828a053..585b88d 100644
--- a/testsuites/psxtmtests/psxtmsem03/init.c
+++ b/testsuites/psxtmtests/psxtmsem03/init.c
@@ -16,7 +16,7 @@
#include <semaphore.h>
#include <tmacros.h>
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
diff --git a/testsuites/psxtmtests/psxtmsem04/init.c b/testsuites/psxtmtests/psxtmsem04/init.c
index 64cbc33..5cebc9d 100644
--- a/testsuites/psxtmtests/psxtmsem04/init.c
+++ b/testsuites/psxtmtests/psxtmsem04/init.c
@@ -20,7 +20,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
const char rtems_test_name[] = "PSXTMSEM 04";
diff --git a/testsuites/psxtmtests/psxtmsem05/init.c b/testsuites/psxtmtests/psxtmsem05/init.c
index fd1585d..12594c4 100644
--- a/testsuites/psxtmtests/psxtmsem05/init.c
+++ b/testsuites/psxtmtests/psxtmsem05/init.c
@@ -20,7 +20,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
const char rtems_test_name[] = "PSXTMSEM 05";
diff --git a/testsuites/psxtmtests/psxtmsleep01/init.c b/testsuites/psxtmtests/psxtmsleep01/init.c
index 68a2e23..f2ee0af 100644
--- a/testsuites/psxtmtests/psxtmsleep01/init.c
+++ b/testsuites/psxtmtests/psxtmsleep01/init.c
@@ -12,7 +12,7 @@
#endif
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
#include <unistd.h>
diff --git a/testsuites/psxtmtests/psxtmsleep02/init.c b/testsuites/psxtmtests/psxtmsleep02/init.c
index 9889175..95fc9d9 100644
--- a/testsuites/psxtmtests/psxtmsleep02/init.c
+++ b/testsuites/psxtmtests/psxtmsleep02/init.c
@@ -12,7 +12,7 @@
#endif
#include <timesys.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
#include <pthread.h>
diff --git a/testsuites/psxtmtests/psxtmthread02/init.c b/testsuites/psxtmtests/psxtmthread02/init.c
index bafa2ac..c468f03 100644
--- a/testsuites/psxtmtests/psxtmthread02/init.c
+++ b/testsuites/psxtmtests/psxtmthread02/init.c
@@ -14,7 +14,7 @@
#include <timesys.h>
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
const char rtems_test_name[] = "PSXTMTHREAD 02";
diff --git a/testsuites/psxtmtests/psxtmthread03/init.c b/testsuites/psxtmtests/psxtmthread03/init.c
index 23acdd0..938a8c6 100644
--- a/testsuites/psxtmtests/psxtmthread03/init.c
+++ b/testsuites/psxtmtests/psxtmthread03/init.c
@@ -17,7 +17,7 @@
#include "test_support.h"
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
const char rtems_test_name[] = "PSXTMTHREAD 03";
diff --git a/testsuites/psxtmtests/psxtmthread04/init.c b/testsuites/psxtmtests/psxtmthread04/init.c
index dc1290c..5b260dd 100644
--- a/testsuites/psxtmtests/psxtmthread04/init.c
+++ b/testsuites/psxtmtests/psxtmthread04/init.c
@@ -14,7 +14,7 @@
#include <timesys.h>
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
const char rtems_test_name[] = "PSXTMTHREAD 04";
diff --git a/testsuites/psxtmtests/psxtmthread05/init.c b/testsuites/psxtmtests/psxtmthread05/init.c
index f127663..53a8b11 100644
--- a/testsuites/psxtmtests/psxtmthread05/init.c
+++ b/testsuites/psxtmtests/psxtmthread05/init.c
@@ -15,7 +15,7 @@
#include <timesys.h>
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
const char rtems_test_name[] = "PSXTMTHREAD 05";
diff --git a/testsuites/psxtmtests/psxtmthread06/init.c b/testsuites/psxtmtests/psxtmthread06/init.c
index 3466a8d..6031909 100644
--- a/testsuites/psxtmtests/psxtmthread06/init.c
+++ b/testsuites/psxtmtests/psxtmthread06/init.c
@@ -16,7 +16,7 @@
#include <timesys.h>
#include <pthread.h>
#include <sched.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
const char rtems_test_name[] = "PSXTMTHREAD 06";
diff --git a/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c b/testsuites/rhealstone/rhdeadlockbrk/deadlockbrk.c
index 9ab620f..a897727 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 a102b6a..0a7741b 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 6495da5..11a29c0 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 4aafc52..6800926 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 137b58a..090fd78 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 6096f18..520de33 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
diff --git a/testsuites/support/src/tmtests_support.c b/testsuites/support/src/tmtests_support.c
index 1d35532..a6230ab 100644
--- a/testsuites/support/src/tmtests_support.c
+++ b/testsuites/support/src/tmtests_support.c
@@ -11,10 +11,8 @@
#include "config.h"
#endif
-#include <rtems/btimer.h>
-
#include <bsp.h>
-#include <rtems/timerdrv.h>
+#include <rtems/btimer.h>
#include "test_support.h"
#include "timesys.h"
#include "tmtests_empty_function.h"
--
1.9.3
More information about the devel
mailing list