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.

7 files changed, 9 insertions, 12 deletions

diff --git a/c/src/lib/libbsp/arm/edb7312/timer/timer.c b/c/src/lib/libbsp/arm/edb7312/timer/timer.c
index c17ee5a18a..b795122ff3 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 058dfcb715..9aad10312b 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 a8f2855660..2aa4910751 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 8b4bc675f0..c700d04566 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 3edae37787..5079452d8c 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 7e83e4096d..e90af08290 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 b45f0f4919..a2a0304737 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;