diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-09-04 08:59:49 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-09-16 16:09:12 -0500 |
| commit | 8fbe2e69b544479feb5a361c6aebeae53eb827c8 (patch) | |
| tree | ad4e97466a3c29c6fd5f3505a8dbbb51558a3d33 /cpukit | |
| parent | or1k: New cache manager. (diff) | |
| download | rtems-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-- | cpukit/libcsupport/Makefile.am | 1 | ||||
| -rw-r--r-- | cpukit/libcsupport/include/timerdrv.h | 34 | ||||
| -rw-r--r-- | cpukit/libcsupport/preinstall.am | 4 | ||||
| -rw-r--r-- | cpukit/sapi/include/confdefs.h | 2 |
4 files changed, 1 insertions, 40 deletions
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index 41de47150e..835f96e98d 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -12,7 +12,6 @@ include_rtems_HEADERS += include/iosupp.h include_rtems_HEADERS += include/ringbuf.h include_rtems_HEADERS += include/rtc.h include_rtems_HEADERS += include/spurious.h -include_rtems_HEADERS += include/timerdrv.h include_rtems_HEADERS += include/vmeintr.h ## motorola diff --git a/cpukit/libcsupport/include/timerdrv.h b/cpukit/libcsupport/include/timerdrv.h deleted file mode 100644 index ec6028a296..0000000000 --- a/cpukit/libcsupport/include/timerdrv.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file - * - * @brief Timer Driver for all Boards - * - * This file describes the Timer Driver for all boards. - */ - -/* - * - * 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.org/license/LICENSE. - */ - -#ifndef _RTEMS_TIMERDRV_H -#define _RTEMS_TIMERDRV_H - -#include <rtems/btimer.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* Intentionally empty */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/cpukit/libcsupport/preinstall.am b/cpukit/libcsupport/preinstall.am index eb68f50fa4..c4286ba6af 100644 --- a/cpukit/libcsupport/preinstall.am +++ b/cpukit/libcsupport/preinstall.am @@ -46,10 +46,6 @@ $(PROJECT_INCLUDE)/rtems/spurious.h: include/spurious.h $(PROJECT_INCLUDE)/rtems $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/spurious.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/spurious.h -$(PROJECT_INCLUDE)/rtems/timerdrv.h: include/timerdrv.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/timerdrv.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/timerdrv.h - $(PROJECT_INCLUDE)/rtems/vmeintr.h: include/vmeintr.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/vmeintr.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/vmeintr.h diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index f821e0494a..7e7c3106bb 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -1319,7 +1319,7 @@ const rtems_libio_helper rtems_fs_init_helper = #endif #ifdef CONFIGURE_APPLICATION_NEEDS_TIMER_DRIVER - #include <rtems/timerdrv.h> + #include <rtems/btimer.h> #endif #ifdef CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER |