diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-13 18:35:43 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-13 18:35:43 +0000 |
| commit | f4adc0d1a16d638654ac82159f32c97cdf065e1c (patch) | |
| tree | fac02ddc5d60d9abb3cf57cde52c053f6f38c462 /c/src/lib/libbsp/m68k/mvme147 | |
| parent | 2011-07-13 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff) | |
| download | rtems-f4adc0d1a16d638654ac82159f32c97cdf065e1c.tar.bz2 | |
2011-07-13 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1824/cpukit
* startup/bspclean.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/m68k/mvme147')
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/ChangeLog | 8 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index 99a3f84b6b..504b23afde 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog @@ -1,3 +1,11 @@ +2011-07-13 Joel Sherrill <joel.sherrilL@OARcorp.com> + + PR 1824/cpukit + * startup/bspclean.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-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> * startup/bspclean.c: diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c index 114aafd6dc..6c2b86d910 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c @@ -34,7 +34,9 @@ void bsp_return_to_monitor_trap(void) __asm__ volatile ( "jmp %0@" : "=a" (start_addr) : "0" (start_addr) ); } -void bsp_cleanup( void ) +void bsp_cleanup( + uint32_t status +) { pcc->timer1_int_control = 0; /* Disable Timer 1 */ pcc->timer2_int_control = 0; /* Disable Timer 2 */ |