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.

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>
 

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>

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";
 

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";
 

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";
 

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";

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";
 

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";
 

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";

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
 

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
 

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>

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"

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"

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>

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"

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";
 

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"

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>

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";
 

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";
 

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"

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";

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>

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"
 

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";

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";

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";

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";

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";
 

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";
 

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";

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";

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>

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";
 

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";
 

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>

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>

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";

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";
 

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";

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";

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";

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";
 

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 */

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";
 

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";
 

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";
 

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
 

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"