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.

1 files changed, 9 insertions, 10 deletions

diff --git a/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c
index 85b36308fb..c20fdc5cca 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@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;