diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-02-17 10:17:20 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-02-19 09:59:39 +0100 |
| commit | b39e055a492cade3e6614b9434c4f5b6bd848960 (patch) | |
| tree | 7800f0256f8f0521c4d7631e9b35f5f460caf8f2 /cpukit | |
| parent | score: Move _SMP_Request_other_cores_to_shutdown() (diff) | |
| download | rtems-b39e055a492cade3e6614b9434c4f5b6bd848960.tar.bz2 | |
score: Delete INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP
This error case is no longer required since rtems_shutdown_executive()
can be called anytime, anywhere
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/sapi/src/exshutdown.c | 17 | ||||
| -rw-r--r-- | cpukit/sapi/src/interrtext.c | 2 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/score/interr.h | 2 |
3 files changed, 3 insertions, 18 deletions
diff --git a/cpukit/sapi/src/exshutdown.c b/cpukit/sapi/src/exshutdown.c index 80848f0953..8b0b149d4b 100644 --- a/cpukit/sapi/src/exshutdown.c +++ b/cpukit/sapi/src/exshutdown.c @@ -14,26 +14,11 @@ #endif #include <rtems/init.h> -#include <rtems/score/sysstate.h> #include <rtems/score/interr.h> void rtems_shutdown_executive( uint32_t result ) { - Internal_errors_Source source; - bool is_internal; - Internal_errors_t code; - - if ( _System_state_Is_up( _System_state_Get() ) ) { - source = RTEMS_FATAL_SOURCE_EXIT; - is_internal = false; - code = result; - } else { - source = INTERNAL_ERROR_CORE; - is_internal = true; - code = INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP; - } - - _Internal_error_Occurred( source, is_internal, code ); + _Internal_error_Occurred( RTEMS_FATAL_SOURCE_EXIT, false, result ); /*************************************************************** *************************************************************** diff --git a/cpukit/sapi/src/interrtext.c b/cpukit/sapi/src/interrtext.c index a66add5d70..66ce6da794 100644 --- a/cpukit/sapi/src/interrtext.c +++ b/cpukit/sapi/src/interrtext.c @@ -47,7 +47,7 @@ static const char *const internal_error_text[] = { "INTERNAL_ERROR_IMPLEMENTATION_BLOCKING_OPERATION_CANCEL", "INTERNAL_ERROR_MUTEX_OBTAIN_FROM_BAD_STATE", "INTERNAL_ERROR_UNLIMITED_AND_MAXIMUM_IS_0", - "INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP", + "OBSOLETE_INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP", "INTERNAL_ERROR_GXX_KEY_ADD_FAILED", "INTERNAL_ERROR_GXX_MUTEX_INIT_FAILED", "INTERNAL_ERROR_NO_MEMORY_FOR_HEAP", diff --git a/cpukit/score/include/rtems/score/interr.h b/cpukit/score/include/rtems/score/interr.h index 2ee7109cf2..f181c55560 100644 --- a/cpukit/score/include/rtems/score/interr.h +++ b/cpukit/score/include/rtems/score/interr.h @@ -143,7 +143,7 @@ typedef enum { INTERNAL_ERROR_IMPLEMENTATION_BLOCKING_OPERATION_CANCEL, INTERNAL_ERROR_MUTEX_OBTAIN_FROM_BAD_STATE, INTERNAL_ERROR_UNLIMITED_AND_MAXIMUM_IS_0, - INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP, + OBSOLETE_INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP, INTERNAL_ERROR_GXX_KEY_ADD_FAILED, INTERNAL_ERROR_GXX_MUTEX_INIT_FAILED, INTERNAL_ERROR_NO_MEMORY_FOR_HEAP, |