diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-13 18:35:19 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-13 18:35:19 +0000 |
| commit | c48524314b295b82e55c2be8a00c968949120fdc (patch) | |
| tree | 4f8fdce37ab58d4e7de0cc035a256c3972d7eed4 /c/src/lib/libbsp/powerpc/beatnik | |
| parent | 2011-07-13 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff) | |
| download | rtems-c48524314b295b82e55c2be8a00c968949120fdc.tar.bz2 | |
2011-07-13 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1824/cpukit
* startup/bspclean.c, startup/bspstart.c: Return exit/shutdown status
back to boot_card(). boot_card() propagates this to bsp_cleanup() and
returns it to the assembly that started the application.
bsp_cleanup() prototype changed.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/beatnik')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/ChangeLog | 8 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c | 9 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c | 1 |
3 files changed, 15 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/powerpc/beatnik/ChangeLog b/c/src/lib/libbsp/powerpc/beatnik/ChangeLog index 7ee0e090af..c29001f4d5 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/ChangeLog +++ b/c/src/lib/libbsp/powerpc/beatnik/ChangeLog @@ -1,3 +1,11 @@ +2011-07-13 Joel Sherrill <joel.sherrilL@OARcorp.com> + + PR 1824/cpukit + * startup/bspclean.c, startup/bspstart.c: Return exit/shutdown status + back to boot_card(). boot_card() propagates this to bsp_cleanup() and + returns it to the assembly that started the application. + bsp_cleanup() prototype changed. + 2011-07-12 Joel Sherrill <joel.sherrilL@OARcorp.com> * make/custom/beatnik.cfg: Spacing. diff --git a/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c b/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c index 746a48fbde..036cbb4c84 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c +++ b/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c @@ -1,11 +1,16 @@ #include <bsp.h> #include <rtems/bspIo.h> -void bsp_cleanup(void) +void bsp_cleanup( + uint32_t status +) { /* We can't go back to MotLoad since we blew it's memory area * and vectors. Just pull the reset line... */ - printk("bsp_cleanup(): RTEMS terminated -- no way back to MotLoad so I reset the card\n"); + printk( + "bsp_cleanup(): RTEMS terminated -- no way back to MotLoad " + "so I reset the card\n" + ); bsp_reset(); } diff --git a/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c b/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c index 9df047e032..ba517dcc8d 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c @@ -57,7 +57,6 @@ BSP_output_char_function_type BSP_output_char = BSP_output_char_via_serial; BSP_polling_getchar_function_type BSP_poll_char = NULL; -extern void bsp_cleanup(void); extern Triv121PgTbl BSP_pgtbl_setup(unsigned int *); extern void BSP_pgtbl_activate(Triv121PgTbl); extern void BSP_motload_pci_fixup(void); |