2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, README.booting, include/bsp.h, startup/bspclean.c,
	vectors/exceptionhandler.c: Use standardized bsp_cleanup() which can
	optionally print a message, poll for user to press key, and call
	bsp_reset(). Using this eliminates the various bsp_cleanup()
	implementations which had their own implementation and variety of
	string constants.
	* startup/bspreset.c: New file.
	* startup/reboot.c: Removed.

7 files changed, 17 insertions, 12 deletions

diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
index 9c4e130914..7a9cfcdbd1 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
@@ -1,3 +1,14 @@
+2008-09-22	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, README.booting, include/bsp.h, startup/bspclean.c,
+	vectors/exceptionhandler.c: Use standardized bsp_cleanup() which can
+	optionally print a message, poll for user to press key, and call
+	bsp_reset(). Using this eliminates the various bsp_cleanup()
+	implementations which had their own implementation and variety of
+	string constants.
+	* startup/bspreset.c: New file.
+	* startup/reboot.c: Removed.
+
 2008-09-21	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* include/bsp.h: Remove define of BSP_ZERO_WORKSPACE_AUTOMATICALLY.
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 0af857d947..0e88320307 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -36,7 +36,7 @@ startup_SOURCES = startup/bspstart.c \
     ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
     ../../shared/bsppredriverhook.c startup/bspclean.c \
     ../../shared/bsplibc.c ../../shared/bsppost.c \
-    ../../shared/gnatinstallhandler.c startup/reboot.c
+    ../../shared/gnatinstallhandler.c startup/bspreset.c
 pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c
 
 include_bsp_HEADERS = ../../powerpc/shared/console/uart.h
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/README.booting b/c/src/lib/libbsp/powerpc/mvme5500/README.booting
index 19e9567908..bf35053056 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/README.booting
+++ b/c/src/lib/libbsp/powerpc/mvme5500/README.booting
@@ -42,7 +42,7 @@ http://www.nsls.bnl.gov/facility/expsys/software/EPICS/FAQ.txt
    site [snapshot area] )
 
 6) To reboot the RTEMS-MVME5500 (board reset), one can invoke the
-   rtemsReboot() command at Cexp> prompt.
+   bsp_reset() command at Cexp> prompt.
  
 7) Please reference http://www.slac.stanford.edu/~strauman/rtems
 for the source code and installation guidance of cexp, GeSys and
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
index a08809a2d7..2bc26327b4 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
@@ -106,7 +106,6 @@ extern unsigned int BSP_time_base_divisor;
   ((unsigned long long) ((((unsigned long long)BSP_time_base_divisor) * 1000000ULL) /((unsigned long long) BSP_bus_frequency)) * ((unsigned long long) (_value)))
 
 extern void BSP_panic(char *s);
-extern void rtemsReboot(void);
 /* extern int printk(const char *, ...) __attribute__((format(printf, 1, 2))); */
 extern int BSP_disconnect_clock_handler (void);
 extern int BSP_connect_clock_handler (void);
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c
index 1100ddfcd1..69b5557021 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c
@@ -1,4 +1,5 @@
 #include <bsp.h>
+#include <bsp/bootcard.h>
 #include <rtems/bspIo.h>
 #include <libcpu/stackTrace.h>
 
@@ -8,9 +9,7 @@ void bsp_cleanup(void)
 {
 #if AUTO_BOOT
   /* Till Straumann <strauman@slac.stanford.edu> for SVGM */
-  void rtemsReboot();
-
-  rtemsReboot();
+  bsp_reset();
 #else
   /* Kate Feng <feng1@bnl.gov> for the MVME5500 */
   printk("\nPrinting a stack trace for your convenience :-)\n");
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/reboot.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspreset.c
index d6843a8e4e..eb32cadbb6 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/reboot.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspreset.c
@@ -4,7 +4,7 @@
 #include <libcpu/io.h>
 #include <libcpu/stackTrace.h>
 
-void rtemsReboot()
+void bsp_reset()
 {
 
   printk("Printing a stack trace for your convenience :-)\n");
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c b/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c
index 5d29b395ea..698ef6d225 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c
@@ -63,10 +63,6 @@
 extern void
 BSP_printStackTrace(BSP_Exception_frame* excPtr);
 
-
-extern void
-rtemsReboot(void);
-
 static volatile BSP_ExceptionExtension	BSP_exceptionExtension = 0;
 
 BSP_ExceptionExtension
@@ -236,7 +232,7 @@ int			quiet=0;
 			rtems_task_suspend(id);
 		} else {
 			printk("PANIC, rebooting...\n");
-			rtemsReboot();
+			bsp_reset();
 		}
     }
 }