diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-12-06 17:47:30 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-12-07 09:38:41 +0100 |
commit | 48bff53b3dec885085b87db413329830110c9bb0 (patch) | |
tree | ba0c249c350b9f4f84bedb5569f11e611874617e /c/src/lib/libbsp/m68k | |
parent | bsp/gdbarmsim: Do not call bsp_cleanup() (diff) | |
download | rtems-48bff53b3dec885085b87db413329830110c9bb0.tar.bz2 |
score: rtems_initialize_start_multitasking()
Do not return from rtems_initialize_start_multitasking() and call
rtems_fatal() instead with a fatal source of RTEMS_FATAL_SOURCE_EXIT and
a fatal code with the exit status.
Remove all bsp_cleanup() functions. The boot_card() is now a no return
function.
Diffstat (limited to 'c/src/lib/libbsp/m68k')
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/misc/interr.c | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c | 29 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c | 9 |
7 files changed, 6 insertions, 67 deletions
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c b/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c index e8c70c326f..15dd2443dd 100644 --- a/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c @@ -1,6 +1,4 @@ /* - * SBC5206 bsp_cleanup - * * This routine returns control from RTEMS to the monitor. * * Author: @@ -27,10 +25,3 @@ void bsp_fatal_extension( { printk("\nRTEMS exited!\n"); } - -void __attribute__((weak)) bsp_cleanup( - uint32_t status -) -{ - rtems_fatal( RTEMS_FATAL_SOURCE_EXIT, status ); -} diff --git a/c/src/lib/libbsp/m68k/mrm332/misc/interr.c b/c/src/lib/libbsp/m68k/mrm332/misc/interr.c index 356a247bc1..d96f909fba 100644 --- a/c/src/lib/libbsp/m68k/mrm332/misc/interr.c +++ b/c/src/lib/libbsp/m68k/mrm332/misc/interr.c @@ -48,8 +48,3 @@ void bsp_fatal_extension( outbyte( (char)(the_error & 0xff) ); RAW_PUTS(").\r\n"); } - -void bsp_cleanup( uint32_t status ) -{ - rtems_fatal( RTEMS_FATAL_SOURCE_EXIT, status ); -} diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c index 50feb5a52c..fa9fb554ef 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c @@ -44,10 +44,3 @@ void bsp_fatal_extension( M68Kvec[ 45 ] = bsp_return_to_monitor_trap; /* install handler */ __asm__ volatile( "trap #13" ); /* insures SUPV mode */ } - -void bsp_cleanup( - uint32_t status -) -{ - rtems_fatal( RTEMS_FATAL_SOURCE_EXIT, status ); -} diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c index 405d9262fd..e566c1d5b1 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c @@ -43,10 +43,3 @@ void bsp_fatal_extension( M68Kvec[ 45 ] = bsp_return_to_monitor_trap; /* install handler */ __asm__ volatile( "trap #13" ); /* ensures SUPV mode */ } - -void bsp_cleanup( - uint32_t status -) -{ - rtems_fatal( RTEMS_FATAL_SOURCE_EXIT, status ); -} diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c index 3b275d98cd..ca5973923b 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c @@ -55,10 +55,3 @@ void bsp_fatal_extension( M68Kvec[ 45 ] = bsp_return_to_monitor_trap; /* install handler */ __asm__ volatile( "trap #13" ); /* insures SUPV mode */ } - -void bsp_cleanup( - uint32_t status -) -{ - rtems_fatal( RTEMS_FATAL_SOURCE_EXIT, status ); -} diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c index 68e127ff2c..820ffe89ed 100644 --- a/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c @@ -49,19 +49,7 @@ static void bsp_return_to_monitor_trap( void ) __asm__ volatile( "jmp %0@" : "=a" (start_addr) : "0" (start_addr) ); } -void bsp_fatal_extension( - rtems_fatal_source source, - bool is_internal, - rtems_fatal_code error -) -{ - M68Kvec[ 45 ] = bsp_return_to_monitor_trap; - __asm__ volatile( "trap #13" ); -} - /* - * bsp_cleanup - * * This code was copied from other MC680x0 MVME BSPs. * Our guess is that someone was concerned about the CPU no longer being in * supervisor mode when they got here. This function forces the CPU back to @@ -73,18 +61,13 @@ void bsp_fatal_extension( * problems if 167Bug is invoked before we get to switch the VBR back to * 167Bug because trap 13 is documented as being reserved for the internal * use of the debugger. - * - * Prototyped in rtems/c/src/lib/libbsp/m68k/mvme167/include/bsp.h - * - * Input parameters: NONE - * - * Output parameters: NONE - * - * Return values: DOES NOT RETURN */ -void bsp_cleanup( - uint32_t status +void bsp_fatal_extension( + rtems_fatal_source source, + bool is_internal, + rtems_fatal_code error ) { - rtems_fatal( RTEMS_FATAL_SOURCE_EXIT, status ); + M68Kvec[ 45 ] = bsp_return_to_monitor_trap; + __asm__ volatile( "trap #13" ); } diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c index dc17af738c..37aac9e1a4 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c @@ -1,6 +1,4 @@ /* - * SBC5206 bsp_cleanup - * * This routine returns control from RTEMS to the monitor. * * Author: W. Eric Norum <norume@aps.anl.gov> @@ -24,10 +22,3 @@ void bsp_fatal_extension( { bsp_reset(); } - -void bsp_cleanup( - uint32_t status -) -{ - rtems_fatal( RTEMS_FATAL_SOURCE_EXIT, status ); -} |