diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-22 21:50:23 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-22 21:50:23 +0000 |
| commit | be10c5e4b977252935d2ba575012ebea61be2218 (patch) | |
| tree | 519cc82cfcc03800885af1f2710027c2d4a2ce2f | |
| parent | 2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-be10c5e4b977252935d2ba575012ebea61be2218.tar.bz2 | |
2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* include/bsp.h, startup/misc.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.
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mvme3100/ChangeLog | 8 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/mvme3100/startup/misc.c | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog index 479cf83458..e395aaae69 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog @@ -1,3 +1,11 @@ +2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com> + + * include/bsp.h, startup/misc.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. + 2008-09-15 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile.am, configure.ac, include/bsp.h, include/bspopts.h.in, diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h index db672f4de9..82e1d49762 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h @@ -173,11 +173,6 @@ extern "C" { int BSP_i2c_initialize(); -/* Misc utility definitions and routines */ - -void -rtemsReboot(); - /* System Control Register */ #define BSP_MVME3100_SYS_CR ((volatile uint8_t *)0xe2000001) #define BSP_MVME3100_SYS_CR_RESET_MSK (7<<5) @@ -298,7 +293,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/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; /* |