Reset card on RTEMS shutdown.

16 files changed, 35 insertions, 21 deletions

diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog
index 018ef0ad2e..982bef19e8 100644
--- a/c/src/lib/libbsp/powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/ChangeLog
@@ -1,3 +1,14 @@
+2008-10-23	Eric Norum <norume@aps.anl.gov>
+
+	* ep1a/include/bsp.h, motorola_powerpc/Makefile.am,
+	motorola_powerpc/include/bsp.h, mvme3100/Makefile.am,
+	mvme3100/include/bsp.h, mvme3100/startup/bspstart.c,
+	mvme3100/startup/misc.c, mvme5500/include/bsp.h,
+	mvme5500/startup/bspclean.c, mvme5500/startup/reboot.c,
+	mvme5500/vectors/exceptionhandler.c, shared/console/inch.c,
+	shared/console/reboot.c, shared/startup/bspstart.c,
+	shared/startup/panic.c: Reset card on RTEMS shutdown
+
 2008-09-08	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* acinclude.m4: Add tqm8xx.
diff --git a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
index c73243d2ba..96699dcfe3 100644
--- a/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
@@ -187,7 +187,7 @@ extern unsigned int BSP_time_base_divisor;
   asm(" eieio ")
 
 extern void BSP_panic(char *s);
-extern void rtemsReboot(void);
+extern void bsp_reset(void);
 extern int BSP_disconnect_clock_handler (void);
 extern int BSP_connect_clock_handler (void);
 
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 86c3dab9ec..4796d5a3d7 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -52,7 +52,7 @@ startup_SOURCES = ../../powerpc/shared/startup/bspstart.c \
     ../../powerpc/shared/startup/pgtbl_setup.c \
     ../../powerpc/shared/startup/pgtbl_activate.c \
     ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
-    ../../shared/bspclean.c ../../shared/bsplibc.c ../../shared/bsppost.c \
+    ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../shared/gnatinstallhandler.c
 tod_SOURCES = ../../shared/tod.c ../../powerpc/shared/tod/todcfg.c
 pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
index 5b6bd2076a..63252e7c57 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
@@ -189,7 +189,7 @@ extern char *BSP_commandline_string;
   ((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 void bsp_reset(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/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 7f0c66475d..02e018d24b 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -61,7 +61,7 @@ startup_SOURCES = startup/bspstart.c build_date.c \
     ../../powerpc/shared/startup/pretaskinghook.c \
     ../../powerpc/shared/startup/zerobss.c \
     ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
-    ../../shared/bspclean.c ../../shared/bsplibc.c ../../shared/bsppost.c \
+    ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../shared/gnatinstallhandler.c
 tod_SOURCES = ../../shared/tod.c tod/todcfg.c
 pclock_SOURCES = ../../powerpc/shared/clock/p_clock.c
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
index 50bf2d480c..22ad5fe55b 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
@@ -174,8 +174,7 @@ BSP_i2c_initialize();
 
 /* Misc utility definitions and routines */
 
-void
-rtemsReboot();
+void bsp_reset(void);
 
 /* System Control Register */
 #define BSP_MVME3100_SYS_CR				((volatile uint8_t *)0xe2000001)
@@ -301,7 +300,6 @@ extern char *BSP_commandline_string;
 
 extern rtems_configuration_table  BSP_Configuration;
 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/mvme3100/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
index e960bb2f39..8e1926f932 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
@@ -48,9 +48,13 @@
 #endif
 
 extern unsigned long __rtems_end[];
-extern void          bsp_cleanup(void);
 extern void			 BSP_vme_config(void);
 
+void bsp_cleanup(void)
+{
+    bsp_reset();
+}
+
 SPR_RW(SPRG1)
 
 /*
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/startup/misc.c b/c/src/lib/libbsp/powerpc/mvme3100/startup/misc.c
index 98ab3eb07b..8ed1842691 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/startup/misc.c
+++ b/c/src/lib/libbsp/powerpc/mvme3100/startup/misc.c
@@ -52,7 +52,7 @@
 #include <bsp.h>
 
 void
-rtemsReboot()
+bsp_reset()
 {
 uint8_t v;
 	/*
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
index 1ec58622b9..d7436af42a 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
@@ -101,7 +101,7 @@ 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 void bsp_reset(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..c1485a856c 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c
@@ -8,9 +8,9 @@ void bsp_cleanup(void)
 {
 #if AUTO_BOOT
   /* Till Straumann <strauman@slac.stanford.edu> for SVGM */
-  void rtemsReboot();
+  void bsp_reset();
 
-  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/reboot.c
index d6843a8e4e..eb32cadbb6 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/reboot.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/reboot.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..393d9d992f 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c
@@ -65,7 +65,7 @@ BSP_printStackTrace(BSP_Exception_frame* excPtr);
 
 
 extern void
-rtemsReboot(void);
+bsp_reset(void);
 
 static volatile BSP_ExceptionExtension	BSP_exceptionExtension = 0;
 
@@ -236,7 +236,7 @@ int			quiet=0;
 			rtems_task_suspend(id);
 		} else {
 			printk("PANIC, rebooting...\n");
-			rtemsReboot();
+			bsp_reset();
 		}
     }
 }
diff --git a/c/src/lib/libbsp/powerpc/shared/console/inch.c b/c/src/lib/libbsp/powerpc/shared/console/inch.c
index f9a2bffdd1..37eef92853 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/inch.c
+++ b/c/src/lib/libbsp/powerpc/shared/console/inch.c
@@ -154,7 +154,7 @@ _IBMPC_scankey(char *outChar)
 
     case 0x53:
       if (ctrl_pressed && alt_pressed)
-        rtemsReboot(); /* ctrl+alt+del -> reboot */
+        bsp_reset(); /* ctrl+alt+del -> reboot */
       break;
 
     /*
diff --git a/c/src/lib/libbsp/powerpc/shared/console/reboot.c b/c/src/lib/libbsp/powerpc/shared/console/reboot.c
index cf5e378ef1..ddba02ad44 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/reboot.c
+++ b/c/src/lib/libbsp/powerpc/shared/console/reboot.c
@@ -5,13 +5,13 @@
 #include <libcpu/stackTrace.h>
 
 /*-------------------------------------------------------------------------+
-|         Function: rtemsReboot
+|         Function: bsp_reset
 |      Description: Reboot the PC.
 | Global Variables: None.
 |        Arguments: None.
 |          Returns: Nothing.
 +--------------------------------------------------------------------------*/
-void rtemsReboot(void)
+void bsp_reset(void)
 {
   printk("Printing a stack trace for your convenience :-)\n");
   CPU_print_stack();
@@ -22,4 +22,4 @@ void rtemsReboot(void)
 #if defined(mvme2100)
   *(unsigned char*)0xffe00000 |= 0x80;
 #endif
-} /* rtemsReboot */
+} /* bsp_reset */
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
index 10f49be8f7..058a676b34 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
@@ -43,11 +43,12 @@ extern unsigned long __rtems_end[];
 extern void L1_caches_enables(void);
 extern unsigned get_L2CR(void);
 extern void set_L2CR(unsigned);
-extern void bsp_cleanup(void);
 extern Triv121PgTbl BSP_pgtbl_setup(unsigned long);
 extern void			BSP_pgtbl_activate(Triv121PgTbl);
 extern void			BSP_vme_config(void);
 
+void bsp_cleanup(void) { extern void bsp_reset(void); bsp_reset(); }
+
 SPR_RW(SPRG1)
 
 #if defined(DEBUG_BATS)
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/panic.c b/c/src/lib/libbsp/powerpc/shared/startup/panic.c
index 5e54410fae..aeb25f9cc9 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/panic.c
+++ b/c/src/lib/libbsp/powerpc/shared/startup/panic.c
@@ -10,7 +10,7 @@ rebootQuestion()
 {
 	printk("Press a key to reboot\n");
 	BSP_poll_char_via_serial();
-	rtemsReboot();
+	bsp_reset();
 }
 
 void BSP_panic(char *s)