2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>

	* include/rtems/btimer.h: New.
	* Makefile.am: Add rtems/btimer.h
	* libcsupport/include/timerdrv.h: Reflect having split out functions
	  to rtems/btimer.h.

4 files changed, 65 insertions, 11 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index e24490c767..01b4ec84ca 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* include/rtems/btimer.h: New.
+	* Makefile.am: Add rtems/btimer.h
+	* libcsupport/include/timerdrv.h: Reflect having split out functions
+	  to rtems/btimer.h.
+
 2011-02-08	Brett Swimley <bswimley@advanced.pro>
 
 	* libfs/src/rfs/rtems-rfs-rtems.c: Fix bug where the eval path did
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 741c7319dc..d1a3bdd334 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -75,6 +75,7 @@ include_rtems_HEADERS += include/rtems/bspIo.h include/rtems/userenv.h \
     include/rtems/concat.h \
     include/rtems/status-checks.h
 
+include_rtems_HEADERS += include/rtems/btimer.h
 include_rtems_HEADERS += include/rtems/endian.h
 
 ## should be conditional and only installed for PowerPC, x86, and ARM
diff --git a/cpukit/include/rtems/btimer.h b/cpukit/include/rtems/btimer.h
new file mode 100644
index 0000000000..b74a6f6bce
--- /dev/null
+++ b/cpukit/include/rtems/btimer.h
@@ -0,0 +1,54 @@
+/**
+ * @file rtems/btimer.h
+ *
+ *  RTEMS benchmark timer API for all boards.
+ */
+
+/*
+ *  COPYRIGHT (c) 2011 Ralf Corsépius Ulm/Germany
+ *
+ *  Derived from libcsupport/include/timerdrv.h:
+ *
+ *  COPYRIGHT (c) 1989-1999.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+ 
+/*
+ * All the functions declared as extern after this comment
+ * MUST be implemented in each BSP.
+ */
+
+#ifndef _RTEMS_BTIMER_H
+#define _RTEMS_BTIMER_H
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <rtems/rtems/status.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* functions */
+
+extern void benchmark_timer_initialize( void );
+
+extern uint32_t   benchmark_timer_read( void );
+
+extern rtems_status_code benchmark_timer_empty_function( void );
+
+extern void benchmark_timer_disable_subtracting_average_overhead(
+  bool find_flag
+);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/cpukit/libcsupport/include/timerdrv.h b/cpukit/libcsupport/include/timerdrv.h
index bbd8f21f31..872c6db217 100644
--- a/cpukit/libcsupport/include/timerdrv.h
+++ b/cpukit/libcsupport/include/timerdrv.h
@@ -19,21 +19,13 @@
 #ifndef _RTEMS_TIMERDRV_H
 #define _RTEMS_TIMERDRV_H
 
+#include <rtems/btimer.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* functions */
-
-void benchmark_timer_initialize( void );
-
-uint32_t   benchmark_timer_read( void );
-
-rtems_status_code benchmark_timer_empty_function( void );
-
-void benchmark_timer_disable_subtracting_average_overhead(
-  bool find_flag
-);
+/* Intentionally empty */
 
 #ifdef __cplusplus
 }