diff options
Diffstat (limited to 'cpukit/rtems/macros')
-rw-r--r-- | cpukit/rtems/macros/rtems/rtems/asr.inl | 3 | ||||
-rw-r--r-- | cpukit/rtems/macros/rtems/rtems/attr.inl | 9 | ||||
-rw-r--r-- | cpukit/rtems/macros/rtems/rtems/event.inl | 14 | ||||
-rw-r--r-- | cpukit/rtems/macros/rtems/rtems/modes.inl | 5 | ||||
-rw-r--r-- | cpukit/rtems/macros/rtems/rtems/status.inl | 8 | ||||
-rw-r--r-- | cpukit/rtems/macros/rtems/rtems/tasks.inl | 57 |
6 files changed, 36 insertions, 60 deletions
diff --git a/cpukit/rtems/macros/rtems/rtems/asr.inl b/cpukit/rtems/macros/rtems/rtems/asr.inl index 421755879b..6610feea2a 100644 --- a/cpukit/rtems/macros/rtems/rtems/asr.inl +++ b/cpukit/rtems/macros/rtems/rtems/asr.inl @@ -17,7 +17,7 @@ #ifndef __INLINE_ASR_h #define __INLINE_ASR_h -#include <rtems/isr.h> +#include <rtems/core/isr.h> /*PAGE * @@ -27,6 +27,7 @@ #define _ASR_Initialize( _information ) \ { \ + (_information)->is_enabled = TRUE; \ (_information)->handler = NULL; \ (_information)->mode_set = RTEMS_DEFAULT_MODES; \ (_information)->signals_posted = 0; \ diff --git a/cpukit/rtems/macros/rtems/rtems/attr.inl b/cpukit/rtems/macros/rtems/rtems/attr.inl index 97d3463d53..27231871ba 100644 --- a/cpukit/rtems/macros/rtems/rtems/attr.inl +++ b/cpukit/rtems/macros/rtems/rtems/attr.inl @@ -78,5 +78,14 @@ #define _Attributes_Is_inherit_priority( _attribute_set ) \ ( (_attribute_set) & RTEMS_INHERIT_PRIORITY ) +/*PAGE + * + * _Attributes_Is_priority_ceiling + * + */ + +#define _Attributes_Is_priority_ceiling( _attribute_set ) \ + ( (_attribute_set) & RTEMS_PRIORITY_CEILING ) + #endif /* end of include file */ diff --git a/cpukit/rtems/macros/rtems/rtems/event.inl b/cpukit/rtems/macros/rtems/rtems/event.inl index 1d4cb78237..0d2f2e47c7 100644 --- a/cpukit/rtems/macros/rtems/rtems/event.inl +++ b/cpukit/rtems/macros/rtems/rtems/event.inl @@ -22,7 +22,19 @@ */ #define _Event_Manager_initialization() \ - _Event_Sync = FALSE + do { \ + \ + _Event_Sync = FALSE; \ + \ + /* \ + * Register the MP Process Packet routine. \ + */ \ + \ + _MPCI_Register_packet_processor( \ + MP_PACKET_EVENT, \ + _Event_MP_Process_packet \ + ); \ + } while ( 0 ) #endif /* end of include file */ diff --git a/cpukit/rtems/macros/rtems/rtems/modes.inl b/cpukit/rtems/macros/rtems/rtems/modes.inl index 4c8b35a1e8..5f71796c07 100644 --- a/cpukit/rtems/macros/rtems/rtems/modes.inl +++ b/cpukit/rtems/macros/rtems/rtems/modes.inl @@ -41,7 +41,7 @@ */ #define _Modes_Is_asr_disabled( _mode_set ) \ - ( (_mode_set) & RTEMS_ASR_MASK ) + (((_mode_set) & RTEMS_ASR_MASK) == RTEMS_NO_ASR) /*PAGE * @@ -59,8 +59,7 @@ */ #define _Modes_Is_timeslice( _mode_set ) \ - (((_mode_set) & (RTEMS_TIMESLICE_MASK|RTEMS_PREEMPT_MASK)) == \ - (RTEMS_TIMESLICE|RTEMS_PREEMPT) ) + (((_mode_set) & RTEMS_TIMESLICE_MASK) == RTEMS_TIMESLICE) /*PAGE * diff --git a/cpukit/rtems/macros/rtems/rtems/status.inl b/cpukit/rtems/macros/rtems/rtems/status.inl index c4f8a523df..408cb816d1 100644 --- a/cpukit/rtems/macros/rtems/rtems/status.inl +++ b/cpukit/rtems/macros/rtems/rtems/status.inl @@ -35,13 +35,5 @@ #define rtems_are_statuses_equal( _code1, _code2 ) \ ((_code1) == (_code2)) -/* - * _Status_Is_proxy_blocking - * - */ - -#define _Status_Is_proxy_blocking( _code ) \ - ( (_code) == RTEMS_PROXY_BLOCKING ) - #endif /* end of include file */ diff --git a/cpukit/rtems/macros/rtems/rtems/tasks.inl b/cpukit/rtems/macros/rtems/rtems/tasks.inl index 243d0addc7..8dd6ff351b 100644 --- a/cpukit/rtems/macros/rtems/rtems/tasks.inl +++ b/cpukit/rtems/macros/rtems/rtems/tasks.inl @@ -17,11 +17,6 @@ #ifndef __RTEMS_TASKS_inl #define __RTEMS_TASKS_inl -#include <rtems/msgmp.h> -#include <rtems/partmp.h> -#include <rtems/regionmp.h> -#include <rtems/semmp.h> - /*PAGE * * _RTEMS_tasks_Allocate @@ -42,54 +37,22 @@ /*PAGE * - * _RTEMS_tasks_Cancel_wait - * + * _RTEMS_tasks_Priority_to_Core */ - -#define _RTEMS_tasks_Cancel_wait( _the_thread ) \ - { \ - States_Control _state; \ - States_Control _remote_state; \ - \ - _state = (_the_thread)->current_state; \ - \ - if ( _States_Is_waiting_on_thread_queue( _state ) ) { \ - if ( _States_Is_waiting_for_rpc_reply( _state ) && \ - _States_Is_locally_blocked( _state ) ) { \ - _remote_state = _States_Clear( \ - STATES_WAITING_FOR_RPC_REPLY + STATES_TRANSIENT, \ - _state \ - ); \ - \ - switch ( _remote_state ) { \ - \ - case STATES_WAITING_FOR_BUFFER: \ - _Partition_MP_Send_extract_proxy( (_the_thread) ); \ - break; \ - case STATES_WAITING_FOR_SEGMENT: \ - _Region_MP_Send_extract_proxy( (_the_thread) ); \ - break; \ - case STATES_WAITING_FOR_SEMAPHORE: \ - _Semaphore_MP_Send_extract_proxy( (_the_thread) ); \ - break; \ - case STATES_WAITING_FOR_MESSAGE: \ - _Message_queue_MP_Send_extract_proxy( (_the_thread) ); \ - break; \ - } \ - } \ - _Thread_queue_Extract( (_the_thread)->Wait.queue, (_the_thread) ); \ - } \ - else if ( _Watchdog_Is_active( &(_the_thread)->Timer ) ) \ - (void) _Watchdog_Remove( &(_the_thread)->Timer ); \ - } + +#define _RTEMS_tasks_Priority_to_Core( _priority ) \ + ((Priority_Control) (_priority)) /*PAGE * - * _RTEMS_Tasks_Priority_to_Core + * _RTEMS_tasks_Priority_is_valid + * */ -#define _RTEMS_Tasks_Priority_to_Core( _priority ) \ - ((Priority_Control) (_priority)) +#define _RTEMS_tasks_Priority_is_valid( _the_priority ) \ + ( ((_the_priority) >= RTEMS_MINIMUM_PRIORITY) && \ + ((_the_priority) <= RTEMS_MAXIMUM_PRIORITY) ) + #endif /* end of include file */ |