From 8fbe2e69b544479feb5a361c6aebeae53eb827c8 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 4 Sep 2014 08:59:49 -0500 Subject: 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 | 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 +- 43 files changed, 43 insertions(+), 43 deletions(-) (limited to 'testsuites/psxtmtests') diff --git a/testsuites/psxtmtests/psxtmbarrier01/init.c b/testsuites/psxtmtests/psxtmbarrier01/init.c index 059cd0cf82..690653fe64 100644 --- a/testsuites/psxtmtests/psxtmbarrier01/init.c +++ b/testsuites/psxtmtests/psxtmbarrier01/init.c @@ -12,7 +12,7 @@ #endif #include -#include +#include #include "test_support.h" #include diff --git a/testsuites/psxtmtests/psxtmbarrier02/init.c b/testsuites/psxtmtests/psxtmbarrier02/init.c index 9952f63708..0506db9874 100644 --- a/testsuites/psxtmtests/psxtmbarrier02/init.c +++ b/testsuites/psxtmtests/psxtmbarrier02/init.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include "test_support.h" #include diff --git a/testsuites/psxtmtests/psxtmbarrier03/init.c b/testsuites/psxtmtests/psxtmbarrier03/init.c index c8b4c1bea4..d81be082be 100644 --- a/testsuites/psxtmtests/psxtmbarrier03/init.c +++ b/testsuites/psxtmtests/psxtmbarrier03/init.c @@ -17,7 +17,7 @@ #include "test_support.h" #include #include -#include +#include const char rtems_test_name[] = "PSXTMBARRIER 03"; diff --git a/testsuites/psxtmtests/psxtmbarrier04/init.c b/testsuites/psxtmtests/psxtmbarrier04/init.c index 65fe5578c1..2fc3b76fac 100644 --- a/testsuites/psxtmtests/psxtmbarrier04/init.c +++ b/testsuites/psxtmtests/psxtmbarrier04/init.c @@ -15,7 +15,7 @@ #include "test_support.h" #include #include -#include +#include const char rtems_test_name[] = "PSXTMBARRIER 04"; diff --git a/testsuites/psxtmtests/psxtmcond01/init.c b/testsuites/psxtmtests/psxtmcond01/init.c index c4dd63080c..6dd7ab1ce7 100644 --- a/testsuites/psxtmtests/psxtmcond01/init.c +++ b/testsuites/psxtmtests/psxtmcond01/init.c @@ -17,7 +17,7 @@ #include "test_support.h" #include #include -#include +#include const char rtems_test_name[] = "PSXTMCOND 01"; diff --git a/testsuites/psxtmtests/psxtmcond02/init.c b/testsuites/psxtmtests/psxtmcond02/init.c index 668bb432b9..cbbb7992d8 100644 --- a/testsuites/psxtmtests/psxtmcond02/init.c +++ b/testsuites/psxtmtests/psxtmcond02/init.c @@ -13,7 +13,7 @@ #include #include -#include +#include #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 795c8d4982..fdf2dfeee4 100644 --- a/testsuites/psxtmtests/psxtmcond03/init.c +++ b/testsuites/psxtmtests/psxtmcond03/init.c @@ -17,7 +17,7 @@ #include "test_support.h" #include #include -#include +#include const char rtems_test_name[] = "PSXTMCOND 03"; diff --git a/testsuites/psxtmtests/psxtmcond04/init.c b/testsuites/psxtmtests/psxtmcond04/init.c index 2c16dfa04f..889cc99b85 100644 --- a/testsuites/psxtmtests/psxtmcond04/init.c +++ b/testsuites/psxtmtests/psxtmcond04/init.c @@ -17,7 +17,7 @@ #include "test_support.h" #include #include -#include +#include const char rtems_test_name[] = "PSXTMCOND 04"; diff --git a/testsuites/psxtmtests/psxtmcond05/init.c b/testsuites/psxtmtests/psxtmcond05/init.c index ab15fc3a03..81b32d8b14 100644 --- a/testsuites/psxtmtests/psxtmcond05/init.c +++ b/testsuites/psxtmtests/psxtmcond05/init.c @@ -13,7 +13,7 @@ #include #include -#include +#include #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 91bef6c5f8..4f86108ce8 100644 --- a/testsuites/psxtmtests/psxtmcond06/init.c +++ b/testsuites/psxtmtests/psxtmcond06/init.c @@ -17,7 +17,7 @@ #include "test_support.h" #include #include -#include +#include #define N 5 diff --git a/testsuites/psxtmtests/psxtmcond07/init.c b/testsuites/psxtmtests/psxtmcond07/init.c index 11d2912c6d..275eab3b37 100644 --- a/testsuites/psxtmtests/psxtmcond07/init.c +++ b/testsuites/psxtmtests/psxtmcond07/init.c @@ -17,7 +17,7 @@ #include "test_support.h" #include #include -#include +#include #define N 1 diff --git a/testsuites/psxtmtests/psxtmcond08/init.c b/testsuites/psxtmtests/psxtmcond08/init.c index 49ad0d7637..8af9f9dbfc 100644 --- a/testsuites/psxtmtests/psxtmcond08/init.c +++ b/testsuites/psxtmtests/psxtmcond08/init.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "test_support.h" #include diff --git a/testsuites/psxtmtests/psxtmkey01/init.c b/testsuites/psxtmtests/psxtmkey01/init.c index 4b3681e03e..7430b15085 100644 --- a/testsuites/psxtmtests/psxtmkey01/init.c +++ b/testsuites/psxtmtests/psxtmkey01/init.c @@ -12,7 +12,7 @@ #endif #include -#include +#include #include #include #include "test_support.h" diff --git a/testsuites/psxtmtests/psxtmkey02/init.c b/testsuites/psxtmtests/psxtmkey02/init.c index 4814ef00da..fafb8f62bf 100644 --- a/testsuites/psxtmtests/psxtmkey02/init.c +++ b/testsuites/psxtmtests/psxtmkey02/init.c @@ -12,7 +12,7 @@ #endif #include -#include +#include #include #include #include "test_support.h" diff --git a/testsuites/psxtmtests/psxtmmq01/init.c b/testsuites/psxtmtests/psxtmmq01/init.c index ca80374899..aacd968882 100644 --- a/testsuites/psxtmtests/psxtmmq01/init.c +++ b/testsuites/psxtmtests/psxtmmq01/init.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include "test_support.h" #include #include diff --git a/testsuites/psxtmtests/psxtmmutex01/init.c b/testsuites/psxtmtests/psxtmmutex01/init.c index 8a72bf9d5c..c8f6054c65 100644 --- a/testsuites/psxtmtests/psxtmmutex01/init.c +++ b/testsuites/psxtmtests/psxtmmutex01/init.c @@ -12,7 +12,7 @@ #endif #include -#include +#include #include #include #include "test_support.h" diff --git a/testsuites/psxtmtests/psxtmmutex02/init.c b/testsuites/psxtmtests/psxtmmutex02/init.c index b82d23d1dd..3ae6276dbc 100644 --- a/testsuites/psxtmtests/psxtmmutex02/init.c +++ b/testsuites/psxtmtests/psxtmmutex02/init.c @@ -17,7 +17,7 @@ #include "test_support.h" #include #include -#include +#include const char rtems_test_name[] = "PSXTMMUTEX 02"; diff --git a/testsuites/psxtmtests/psxtmmutex03/init.c b/testsuites/psxtmtests/psxtmmutex03/init.c index 07f49a5b54..bad1f278ea 100644 --- a/testsuites/psxtmtests/psxtmmutex03/init.c +++ b/testsuites/psxtmtests/psxtmmutex03/init.c @@ -12,7 +12,7 @@ #endif #include -#include +#include #include #include #include "test_support.h" diff --git a/testsuites/psxtmtests/psxtmmutex04/init.c b/testsuites/psxtmtests/psxtmmutex04/init.c index a1a8aa2dcd..e4227638ac 100644 --- a/testsuites/psxtmtests/psxtmmutex04/init.c +++ b/testsuites/psxtmtests/psxtmmutex04/init.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include "test_support.h" #include diff --git a/testsuites/psxtmtests/psxtmmutex05/init.c b/testsuites/psxtmtests/psxtmmutex05/init.c index d36e5340ab..712b5cc56d 100644 --- a/testsuites/psxtmtests/psxtmmutex05/init.c +++ b/testsuites/psxtmtests/psxtmmutex05/init.c @@ -17,7 +17,7 @@ #include "test_support.h" #include #include -#include +#include const char rtems_test_name[] = "PSXTMMUTEX 05"; diff --git a/testsuites/psxtmtests/psxtmmutex06/init.c b/testsuites/psxtmtests/psxtmmutex06/init.c index 047f06336b..2e8b82de80 100644 --- a/testsuites/psxtmtests/psxtmmutex06/init.c +++ b/testsuites/psxtmtests/psxtmmutex06/init.c @@ -17,7 +17,7 @@ #include "test_support.h" #include #include -#include +#include const char rtems_test_name[] = "PSXTMMUTEX 06"; diff --git a/testsuites/psxtmtests/psxtmmutex07/init.c b/testsuites/psxtmtests/psxtmmutex07/init.c index adee9945ec..299f87d714 100644 --- a/testsuites/psxtmtests/psxtmmutex07/init.c +++ b/testsuites/psxtmtests/psxtmmutex07/init.c @@ -12,7 +12,7 @@ #endif #include -#include +#include #include #include #include "test_support.h" diff --git a/testsuites/psxtmtests/psxtmnanosleep01/init.c b/testsuites/psxtmtests/psxtmnanosleep01/init.c index e86a5d1086..eeb67c1995 100644 --- a/testsuites/psxtmtests/psxtmnanosleep01/init.c +++ b/testsuites/psxtmtests/psxtmnanosleep01/init.c @@ -12,7 +12,7 @@ #endif #include -#include +#include #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 f932811018..12f6b75a6d 100644 --- a/testsuites/psxtmtests/psxtmnanosleep02/init.c +++ b/testsuites/psxtmtests/psxtmnanosleep02/init.c @@ -12,7 +12,7 @@ #endif #include -#include +#include #include "test_support.h" #include diff --git a/testsuites/psxtmtests/psxtmrwlock01/init.c b/testsuites/psxtmtests/psxtmrwlock01/init.c index 2f99a1995b..0073e70382 100644 --- a/testsuites/psxtmtests/psxtmrwlock01/init.c +++ b/testsuites/psxtmtests/psxtmrwlock01/init.c @@ -12,7 +12,7 @@ #endif #include #include -#include +#include #include #include "test_support.h" diff --git a/testsuites/psxtmtests/psxtmrwlock02/init.c b/testsuites/psxtmtests/psxtmrwlock02/init.c index 1017c7ca7f..4ce7fa5ec0 100644 --- a/testsuites/psxtmtests/psxtmrwlock02/init.c +++ b/testsuites/psxtmtests/psxtmrwlock02/init.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #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 76b5db2438..5fdf522c63 100644 --- a/testsuites/psxtmtests/psxtmrwlock03/init.c +++ b/testsuites/psxtmtests/psxtmrwlock03/init.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #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 1eb2236d14..8b1b45dd98 100644 --- a/testsuites/psxtmtests/psxtmrwlock04/init.c +++ b/testsuites/psxtmtests/psxtmrwlock04/init.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #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 95d0fd9f90..1ec86c0efe 100644 --- a/testsuites/psxtmtests/psxtmrwlock05/init.c +++ b/testsuites/psxtmtests/psxtmrwlock05/init.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #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 b83bfdd7f3..b74ac251cb 100644 --- a/testsuites/psxtmtests/psxtmrwlock06/init.c +++ b/testsuites/psxtmtests/psxtmrwlock06/init.c @@ -17,7 +17,7 @@ #include #include #include "test_support.h" -#include +#include const char rtems_test_name[] = "PSXTMRWLOCK 06"; diff --git a/testsuites/psxtmtests/psxtmrwlock07/init.c b/testsuites/psxtmtests/psxtmrwlock07/init.c index 25067555fd..9a779028f8 100644 --- a/testsuites/psxtmtests/psxtmrwlock07/init.c +++ b/testsuites/psxtmtests/psxtmrwlock07/init.c @@ -17,7 +17,7 @@ #include "test_support.h" #include #include -#include +#include const char rtems_test_name[] = "PSXTMRWLOCK 07"; diff --git a/testsuites/psxtmtests/psxtmsem01/init.c b/testsuites/psxtmtests/psxtmsem01/init.c index 10a77307ec..4223a02b3b 100644 --- a/testsuites/psxtmtests/psxtmsem01/init.c +++ b/testsuites/psxtmtests/psxtmsem01/init.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #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 70871ec280..4629ac5f4c 100644 --- a/testsuites/psxtmtests/psxtmsem02/init.c +++ b/testsuites/psxtmtests/psxtmsem02/init.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #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 828a053883..585b88d6cd 100644 --- a/testsuites/psxtmtests/psxtmsem03/init.c +++ b/testsuites/psxtmtests/psxtmsem03/init.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include "test_support.h" #include #include diff --git a/testsuites/psxtmtests/psxtmsem04/init.c b/testsuites/psxtmtests/psxtmsem04/init.c index 64cbc332c8..5cebc9daa0 100644 --- a/testsuites/psxtmtests/psxtmsem04/init.c +++ b/testsuites/psxtmtests/psxtmsem04/init.c @@ -20,7 +20,7 @@ #include "test_support.h" #include #include -#include +#include const char rtems_test_name[] = "PSXTMSEM 04"; diff --git a/testsuites/psxtmtests/psxtmsem05/init.c b/testsuites/psxtmtests/psxtmsem05/init.c index fd1585db6e..12594c4e99 100644 --- a/testsuites/psxtmtests/psxtmsem05/init.c +++ b/testsuites/psxtmtests/psxtmsem05/init.c @@ -20,7 +20,7 @@ #include "test_support.h" #include #include -#include +#include const char rtems_test_name[] = "PSXTMSEM 05"; diff --git a/testsuites/psxtmtests/psxtmsleep01/init.c b/testsuites/psxtmtests/psxtmsleep01/init.c index 68a2e23902..f2ee0af231 100644 --- a/testsuites/psxtmtests/psxtmsleep01/init.c +++ b/testsuites/psxtmtests/psxtmsleep01/init.c @@ -12,7 +12,7 @@ #endif #include -#include +#include #include "test_support.h" #include diff --git a/testsuites/psxtmtests/psxtmsleep02/init.c b/testsuites/psxtmtests/psxtmsleep02/init.c index 9889175308..95fc9d9831 100644 --- a/testsuites/psxtmtests/psxtmsleep02/init.c +++ b/testsuites/psxtmtests/psxtmsleep02/init.c @@ -12,7 +12,7 @@ #endif #include -#include +#include #include "test_support.h" #include diff --git a/testsuites/psxtmtests/psxtmthread02/init.c b/testsuites/psxtmtests/psxtmthread02/init.c index bafa2ac986..c468f0335e 100644 --- a/testsuites/psxtmtests/psxtmthread02/init.c +++ b/testsuites/psxtmtests/psxtmthread02/init.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #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 23acdd071e..938a8c62e0 100644 --- a/testsuites/psxtmtests/psxtmthread03/init.c +++ b/testsuites/psxtmtests/psxtmthread03/init.c @@ -17,7 +17,7 @@ #include "test_support.h" #include #include -#include +#include const char rtems_test_name[] = "PSXTMTHREAD 03"; diff --git a/testsuites/psxtmtests/psxtmthread04/init.c b/testsuites/psxtmtests/psxtmthread04/init.c index dc1290c56a..5b260dd0c3 100644 --- a/testsuites/psxtmtests/psxtmthread04/init.c +++ b/testsuites/psxtmtests/psxtmthread04/init.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #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 f127663fab..53a8b11a31 100644 --- a/testsuites/psxtmtests/psxtmthread05/init.c +++ b/testsuites/psxtmtests/psxtmthread05/init.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #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 3466a8dbc0..603190932d 100644 --- a/testsuites/psxtmtests/psxtmthread06/init.c +++ b/testsuites/psxtmtests/psxtmthread06/init.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include "test_support.h" const char rtems_test_name[] = "PSXTMTHREAD 06"; -- cgit v1.2.3