2005-01-18 Ralf Corsepius <ralf.corsepius@rtems.org>

	* Makefile.am: Use ../../shared/tod.h instead of include/tod.h.
	* console/config.c: Remove typos from 2005-01-04 changes.
	* include/tod.h: Remove.

4 files changed, 11 insertions, 43 deletions

diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog
index 128fc658c1..87dc036d91 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-18	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* Makefile.am: Use ../../shared/tod.h instead of include/tod.h.
+	* console/config.c: Remove typos from 2005-01-04 changes.
+	* include/tod.h: Remove.
+
 2005-01-07	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am
index f5b2cf6dd3..9af9eefa68 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am
@@ -22,7 +22,7 @@ DISTCLEANFILES = include/bspopts.h
 noinst_PROGRAMS =
 
 nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h
-include_HEADERS += include/tod.h
+include_HEADERS += ../../shared/tod.h
 include_HEADERS += include/nvram.h include/pci.h
 
 EXTRA_DIST = start/start.S
@@ -91,8 +91,7 @@ if HAS_NETWORKING
 network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
 noinst_PROGRAMS += network.rel
 network_rel_SOURCES = network/amd79c970.c network/amd79c970.h
-network_rel_CPPFLAGS = $(AM_CPPFLAGS) \
-    $(network_CPPFLAGS)
+network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
@@ -134,7 +133,7 @@ $(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PRO
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
-$(PROJECT_INCLUDE)/tod.h: include/tod.h $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_INCLUDE)/tod.h: ../../shared/tod.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h
 
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c b/c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c
index e4f31995c3..20841c84af 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/config.c
@@ -437,7 +437,7 @@ static boolean config_PMX1553_probe(int minor)
 	 * 1382400 baud (RS422 only).
 	 */
 
-        ulTemp = (uint32_t)Console_Port_Tbl[minor].pDeviceParams
+        ulTemp = (uint32_t)Console_Port_Tbl[minor].pDeviceParams;
 #if 1
 	/*
 	 * Scale requested baud rate for 16 MHz clock
@@ -455,7 +455,7 @@ static boolean config_PMX1553_probe(int minor)
 	 * In order to maintain maximum data rate accuracy, we will
 	 * apply a div 4 here rather than in hardware (using MCR bit 7).
 	 */
-	ultemp /= 4;
+	ulTemp /= 4;
 
 	Console_Port_Tbl[minor].pDeviceParams = (void *)ulTemp;
 
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/tod.h b/c/src/lib/libbsp/powerpc/ppcn_60x/include/tod.h
deleted file mode 100644
index 0b3701ec65..0000000000
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/tod.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Real Time Clock (MK48T08) for RTEMS on PPCn_60x
- *
- *  Based on MVME162 TOD by:
- *    COPYRIGHT (C) 1997
- *    by Katsutoshi Shibuya - BU Denken Co.,Ltd. - Sapporo - JAPAN
- *    ALL RIGHTS RESERVED
- *
- *  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$
- */
-
-#ifndef TOD_H
-#define TOD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void setRealTimeToRTEMS();
-/* Read real time from RTC and set it to RTEMS' clock manager */
-
-extern void setRealTimeFromRTEMS();
-/* Read time from RTEMS' clock manager and set it to RTC */
-
-extern int checkRealTime();
-/* Return the difference between RTC and RTEMS' clock manager time in minutes.
-   If the difference is greater than 1 day, this returns 9999. */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif