RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
* 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.
This commit is contained in:
Joel Sherrill
2008-09-22 21:50:25 +00:00
parent be10c5e4b9
commit 5734337319
7 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
View File

@@ -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.

2
c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
View File

@@ -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

2
c/src/lib/libbsp/powerpc/mvme5500/README.booting
View File

@@ -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

1
c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
View File

@@ -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);

5
c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c
View File

@@ -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");

2
c/src/lib/libbsp/powerpc/mvme5500/startup/reboot.c → c/src/lib/libbsp/powerpc/mvme5500/startup/bspreset.c
View File

@@ -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");

6
c/src/lib/libbsp/powerpc/mvme5500/vectors/exceptionhandler.c
View File

@@ -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();
}
}
}