[rtems commit] tod.h -> libcsupport like other driver and helper prototype files
Joel Sherrill
joel at rtems.org
Tue Sep 16 21:00:27 UTC 2014
Module: rtems
Branch: master
Commit: f535fe5311978af53635c2da8e5cb10ef9d78802
Changeset: http://git.rtems.org/rtems/commit/?id=f535fe5311978af53635c2da8e5cb10ef9d78802
Author: Joel Sherrill <joel.sherrill at oarcorp.com>
Date: Thu Sep 4 15:41:21 2014 -0500
tod.h -> libcsupport like other driver and helper prototype files
This rippled into the handful of files that should have been using
<rtems/tod.h>.
---
c/src/lib/libbsp/m68k/mvme162/tod/tod.c | 2 +-
c/src/lib/libbsp/shared/tod.c | 1 +
c/src/lib/libcpu/bfin/clock/rtc.c | 2 +-
cpukit/libcsupport/Makefile.am | 1 +
.../libcsupport/include/rtems}/tod.h | 3 +--
cpukit/libcsupport/preinstall.am | 4 ++++
6 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/c/src/lib/libbsp/m68k/mvme162/tod/tod.c b/c/src/lib/libbsp/m68k/mvme162/tod/tod.c
index 58e964f..3475979 100644
--- a/c/src/lib/libbsp/m68k/mvme162/tod/tod.c
+++ b/c/src/lib/libbsp/m68k/mvme162/tod/tod.c
@@ -16,7 +16,7 @@
*/
#include <rtems.h>
-#include <tod.h>
+#include <rtems/tod.h>
#define tod ((volatile unsigned char *)0xfffc1ff8)
diff --git a/c/src/lib/libbsp/shared/tod.c b/c/src/lib/libbsp/shared/tod.c
index e074569..64007d6 100644
--- a/c/src/lib/libbsp/shared/tod.c
+++ b/c/src/lib/libbsp/shared/tod.c
@@ -8,6 +8,7 @@
#include <rtems.h>
#include <rtems/rtc.h>
+#include <rtems/tod.h>
#include <rtems/libio.h>
#include <libchip/rtc.h>
diff --git a/c/src/lib/libcpu/bfin/clock/rtc.c b/c/src/lib/libcpu/bfin/clock/rtc.c
index 6e57cb2..17f2cf7 100644
--- a/c/src/lib/libcpu/bfin/clock/rtc.c
+++ b/c/src/lib/libcpu/bfin/clock/rtc.c
@@ -11,7 +11,7 @@
#include <rtems.h>
-#include "tod.h"
+#include <rtems/tod.h>
#include <rtems/rtc.h>
#include <rtems/libio.h>
#include <bsp.h>
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index 835f96e..d39f8f9 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -11,6 +11,7 @@ include_rtems_HEADERS += include/rtems/framebuffer.h
include_rtems_HEADERS += include/iosupp.h
include_rtems_HEADERS += include/ringbuf.h
include_rtems_HEADERS += include/rtc.h
+include_rtems_HEADERS += include/rtems/tod.h
include_rtems_HEADERS += include/spurious.h
include_rtems_HEADERS += include/vmeintr.h
diff --git a/c/src/lib/libbsp/shared/tod.h b/cpukit/libcsupport/include/rtems/tod.h
similarity index 94%
rename from c/src/lib/libbsp/shared/tod.h
rename to cpukit/libcsupport/include/rtems/tod.h
index 605cef2..971e854 100644
--- a/c/src/lib/libbsp/shared/tod.h
+++ b/cpukit/libcsupport/include/rtems/tod.h
@@ -3,7 +3,7 @@
*
* @ingroup shared_tod
*
- * @brief Real Time Clock (MK48T08) for RTEMS on Score603e
+ * @brief Real Time Clock Time of Day API Definition
*/
/*
@@ -32,7 +32,6 @@ extern "C" {
*
* @brief Set the RTC
*/
-
int setRealTime(
const rtems_time_of_day *tod
);
diff --git a/cpukit/libcsupport/preinstall.am b/cpukit/libcsupport/preinstall.am
index c4286ba..e56d946 100644
--- a/cpukit/libcsupport/preinstall.am
+++ b/cpukit/libcsupport/preinstall.am
@@ -42,6 +42,10 @@ $(PROJECT_INCLUDE)/rtems/rtc.h: include/rtc.h $(PROJECT_INCLUDE)/rtems/$(dirstam
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/rtc.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtc.h
+$(PROJECT_INCLUDE)/rtems/tod.h: include/rtems/tod.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/tod.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/tod.h
+
$(PROJECT_INCLUDE)/rtems/spurious.h: include/spurious.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/spurious.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/spurious.h
More information about the vc
mailing list