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

	* Makefile.am, configure.ac, console/uart.c, startup/bspclean.c,
	startup/bspstart.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.

3 files changed, 26 insertions, 16 deletions

diff --git a/c/src/lib/libbsp/arm/csb336/startup/bspclean.c b/c/src/lib/libbsp/arm/csb336/startup/bspclean.c
index 869d15dbc1..c316950aa4 100644
--- a/c/src/lib/libbsp/arm/csb336/startup/bspclean.c
+++ b/c/src/lib/libbsp/arm/csb336/startup/bspclean.c
@@ -6,11 +6,11 @@
  *
  *  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$
  */
+
 #include <stdio.h>
 #include <bsp.h>
 #include <rtems/bspIo.h>
diff --git a/c/src/lib/libbsp/arm/csb336/startup/bspreset.c b/c/src/lib/libbsp/arm/csb336/startup/bspreset.c
new file mode 100644
index 0000000000..53b6c6af6f
--- /dev/null
+++ b/c/src/lib/libbsp/arm/csb336/startup/bspreset.c
@@ -0,0 +1,25 @@
+/*
+ *  Cogent CSB336 Shutdown code
+ *
+ *  Copyright (c) 2004 by Cogent Computer Systems
+ *  Written by Jay Monkman <jtm@lopingdog.com>
+ *
+ *  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$
+ */
+
+#include <bsp.h>
+#include <rtems/bspIo.h>
+
+void bsp_reset(void)
+{
+  rtems_interrupt_level level;
+
+  rtems_interrupt_disable(level);
+
+  printk("\n\rI should reset here.\n\r");
+  while(1);
+}
diff --git a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c
index 41debe0b28..bb22eca0a0 100644
--- a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c
@@ -126,18 +126,3 @@ int get_perclk1_freq(void)
  */
 void bsp_start (void) __attribute__ ((weak, alias("bsp_start_default")));
 
-/**
- *  Reset the system.
- *
- *  This functions enables the watchdog and waits for it to
- *  fire, thus resetting the system.
- */
-void bsp_reset(void)
-{
-  rtems_interrupt_level level;
-
-  _CPU_ISR_Disable(level);
-
-  printk("\n\rI should reset here.\n\r");
-  while(1);
-}