diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-08-01 14:55:03 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-08-05 13:45:36 +0200 |
| commit | 2bca05f7d72ae5f7bfd6c62db6c313fb0693a158 (patch) | |
| tree | 6579c7a28284fda0e7b5ecf9e0c5171d9b69b1bf | |
| parent | sptests/spfreechain01: Fix Makefile.am (diff) | |
| download | rtems-2bca05f7d72ae5f7bfd6c62db6c313fb0693a158.tar.bz2 | |
score: Delete SYSTEM_STATE_BEGIN_MULTITASKING
Nothing happened between the SYSTEM_STATE_BEGIN_MULTITASKING to
SYSTEM_STATE_UP transition.
| -rw-r--r-- | cpukit/sapi/src/exinit.c | 2 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/score/coremuteximpl.h | 4 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/score/sysstate.h | 12 |
3 files changed, 2 insertions, 16 deletions
diff --git a/cpukit/sapi/src/exinit.c b/cpukit/sapi/src/exinit.c index 5574b43910..7dad241d6c 100644 --- a/cpukit/sapi/src/exinit.c +++ b/cpukit/sapi/src/exinit.c @@ -219,8 +219,6 @@ void rtems_initialize_start_multitasking(void) { uint32_t status; - _System_state_Set( SYSTEM_STATE_BEGIN_MULTITASKING ); - #ifdef RTEMS_SMP _SMP_Request_other_cores_to_perform_first_context_switch(); #endif diff --git a/cpukit/score/include/rtems/score/coremuteximpl.h b/cpukit/score/include/rtems/score/coremuteximpl.h index aa7f0d99cd..aefddabcd8 100644 --- a/cpukit/score/include/rtems/score/coremuteximpl.h +++ b/cpukit/score/include/rtems/score/coremuteximpl.h @@ -213,12 +213,12 @@ void _CORE_mutex_Seize_interrupt_blocking( #define _CORE_mutex_Check_dispatch_for_seize(_wait) \ (_Thread_Dispatch_get_disable_level() != 1 \ && (_wait) \ - && (_System_state_Get() >= SYSTEM_STATE_BEGIN_MULTITASKING)) + && (_System_state_Get() >= SYSTEM_STATE_UP)) #else #define _CORE_mutex_Check_dispatch_for_seize(_wait) \ (!_Thread_Dispatch_is_enabled() \ && (_wait) \ - && (_System_state_Get() >= SYSTEM_STATE_BEGIN_MULTITASKING)) + && (_System_state_Get() >= SYSTEM_STATE_UP)) #endif /** diff --git a/cpukit/score/include/rtems/score/sysstate.h b/cpukit/score/include/rtems/score/sysstate.h index 6599dff4f1..304b9529c3 100644 --- a/cpukit/score/include/rtems/score/sysstate.h +++ b/cpukit/score/include/rtems/score/sysstate.h @@ -49,11 +49,6 @@ typedef enum { SYSTEM_STATE_BEFORE_MULTITASKING, /** - * @brief The system is attempting to initiate multitasking. - */ - SYSTEM_STATE_BEGIN_MULTITASKING, - - /** * @brief The system is up and operating normally. */ SYSTEM_STATE_UP, @@ -119,13 +114,6 @@ RTEMS_INLINE_ROUTINE bool _System_state_Is_before_multitasking ( return (state == SYSTEM_STATE_BEFORE_MULTITASKING); } -RTEMS_INLINE_ROUTINE bool _System_state_Is_begin_multitasking ( - System_state_Codes state -) -{ - return (state == SYSTEM_STATE_BEGIN_MULTITASKING); -} - RTEMS_INLINE_ROUTINE bool _System_state_Is_shutdown ( System_state_Codes state ) |