summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@oarcorp.com>2014-09-04 08:59:49 -0500
committerJoel Sherrill <joel.sherrill@oarcorp.com>2014-09-16 16:09:12 -0500
commit8fbe2e69b544479feb5a361c6aebeae53eb827c8 (patch)
treead4e97466a3c29c6fd5f3505a8dbbb51558a3d33 /c/src/lib/libcpu/powerpc/ppc403/timer/timer.c
parentor1k: New cache manager. (diff)
downloadrtems-8fbe2e69b544479feb5a361c6aebeae53eb827c8.tar.bz2
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.
Diffstat (limited to '')
-rw-r--r--c/src/lib/libcpu/powerpc/ppc403/timer/timer.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c b/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c
index 5ee5ff42e5..f883facb80 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@i-cubed.co.uk>
+ */
+
+/*
+ * Author: Andrew Bray <andy@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;