From f535fe5311978af53635c2da8e5cb10ef9d78802 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@oarcorp.com>
Date: Thu, 4 Sep 2014 15:41:21 -0500
Subject: [PATCH] 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 +
 .../libbsp/shared => cpukit/libcsupport/include/rtems}/tod.h  | 3 +--
 cpukit/libcsupport/preinstall.am                              | 4 ++++
 6 files changed, 9 insertions(+), 4 deletions(-)
 rename {c/src/lib/libbsp/shared => cpukit/libcsupport/include/rtems}/tod.h (94%)

diff --git a/c/src/lib/libbsp/m68k/mvme162/tod/tod.c b/c/src/lib/libbsp/m68k/mvme162/tod/tod.c
index 58e964f7fa..3475979ac4 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 e074569324..64007d6397 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 6e57cb26bb..17f2cf78be 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 835f96e98d..d39f8f9dc0 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 605cef2c29..971e8548e8 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 c4286ba6af..e56d94657b 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