diff options
Diffstat (limited to '')
-rw-r--r-- | c/src/exec/rtems/include/rtems.h | 2 | ||||
-rw-r--r-- | c/src/exec/rtems/include/rtems/rtems/Makefile.in | 12 | ||||
-rw-r--r-- | c/src/exec/rtems/include/rtems/rtems/event.h | 2 | ||||
-rw-r--r-- | c/src/exec/rtems/include/rtems/rtems/message.h | 4 | ||||
-rw-r--r-- | c/src/exec/rtems/include/rtems/rtems/part.h | 2 | ||||
-rw-r--r-- | c/src/exec/rtems/include/rtems/rtems/region.h | 2 | ||||
-rw-r--r-- | c/src/exec/rtems/include/rtems/rtems/sem.h | 4 | ||||
-rw-r--r-- | c/src/exec/rtems/include/rtems/rtems/signal.h | 2 | ||||
-rw-r--r-- | c/src/exec/rtems/include/rtems/rtems/tasks.h | 2 | ||||
-rw-r--r-- | c/src/exec/rtems/include/rtems/rtems/types.h | 6 |
10 files changed, 34 insertions, 4 deletions
diff --git a/c/src/exec/rtems/include/rtems.h b/c/src/exec/rtems/include/rtems.h index 9a165c08dd..01c0b8478b 100644 --- a/c/src/exec/rtems/include/rtems.h +++ b/c/src/exec/rtems/include/rtems.h @@ -57,7 +57,9 @@ extern "C" { #include <rtems/io.h> #include <rtems/fatal.h> #include <rtems/rtems/ratemon.h> +#if defined(RTEMS_MULTIPROCESSING) #include <rtems/rtems/mp.h> +#endif #include <rtems/rtems/support.h> #include <rtems/score/sysstate.h> diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/rtems/Makefile.in index adb4903db8..f5904f6d25 100644 --- a/c/src/exec/rtems/include/rtems/rtems/Makefile.in +++ b/c/src/exec/rtems/include/rtems/rtems/Makefile.in @@ -8,10 +8,14 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ -H_PIECES=asr attr clock config dpmem event eventmp eventset \ - intr message modes mp msgmp options part partmp \ - ratemon region regionmp rtemsapi sem semmp signal signalmp status \ - support taskmp tasks timer types +# We only build multiprocessing related files if HAS_MP was defined +MP_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp +MP_PIECES = $(MP_PIECES_$(HAS_MP)_V) + +H_PIECES=asr attr clock config dpmem event eventset \ + intr message modes options part \ + ratemon region rtemsapi sem signal status \ + support tasks timer types $(MP_PIECES) H_FILES=$(H_PIECES:%=$(srcdir)/%.h) # H_FILES that get installed externally diff --git a/c/src/exec/rtems/include/rtems/rtems/event.h b/c/src/exec/rtems/include/rtems/rtems/event.h index 48045bdade..576b1edbff 100644 --- a/c/src/exec/rtems/include/rtems/rtems/event.h +++ b/c/src/exec/rtems/include/rtems/rtems/event.h @@ -161,7 +161,9 @@ void _Event_Timeout ( RTEMS_EXTERN volatile Event_Sync_states _Event_Sync_state; +#if defined(RTEMS_MULTIPROCESSING) #include <rtems/rtems/eventmp.h> +#endif #ifndef __RTEMS_APPLICATION__ #include <rtems/rtems/event.inl> #endif diff --git a/c/src/exec/rtems/include/rtems/rtems/message.h b/c/src/exec/rtems/include/rtems/rtems/message.h index 611d46fde8..283381eecc 100644 --- a/c/src/exec/rtems/include/rtems/rtems/message.h +++ b/c/src/exec/rtems/include/rtems/rtems/message.h @@ -316,15 +316,19 @@ rtems_status_code _Message_queue_Translate_core_message_queue_return_code ( * Output parameters: NONE */ +#if defined(RTEMS_MULTIPROCESSING) void _Message_queue_Core_message_queue_mp_support ( Thread_Control *the_thread, Objects_Id id ); +#endif #ifndef __RTEMS_APPLICATION__ #include <rtems/rtems/message.inl> #endif +#if defined(RTEMS_MULTIPROCESSING) #include <rtems/rtems/msgmp.h> +#endif #ifdef __cplusplus } diff --git a/c/src/exec/rtems/include/rtems/rtems/part.h b/c/src/exec/rtems/include/rtems/rtems/part.h index 1d720db146..884c9a5426 100644 --- a/c/src/exec/rtems/include/rtems/rtems/part.h +++ b/c/src/exec/rtems/include/rtems/rtems/part.h @@ -158,7 +158,9 @@ rtems_status_code rtems_partition_return_buffer( #ifndef __RTEMS_APPLICATION__ #include <rtems/rtems/part.inl> #endif +#if defined(RTEMS_MULTIPROCESSING) #include <rtems/rtems/partmp.h> +#endif #ifdef __cplusplus } diff --git a/c/src/exec/rtems/include/rtems/rtems/region.h b/c/src/exec/rtems/include/rtems/rtems/region.h index 05418f6a95..93f279fcb5 100644 --- a/c/src/exec/rtems/include/rtems/rtems/region.h +++ b/c/src/exec/rtems/include/rtems/rtems/region.h @@ -201,7 +201,9 @@ rtems_status_code rtems_region_return_segment( #ifndef __RTEMS_APPLICATION__ #include <rtems/rtems/region.inl> #endif +#if defined(RTEMS_MULTIPROCESSING) #include <rtems/rtems/regionmp.h> +#endif /* * _Region_Debug_Walk diff --git a/c/src/exec/rtems/include/rtems/rtems/sem.h b/c/src/exec/rtems/include/rtems/rtems/sem.h index 191e62b414..96ae149192 100644 --- a/c/src/exec/rtems/include/rtems/rtems/sem.h +++ b/c/src/exec/rtems/include/rtems/rtems/sem.h @@ -214,10 +214,12 @@ rtems_status_code _Semaphore_Translate_core_semaphore_return_code ( * is called by the core. */ +#if defined(RTEMS_MULTIPROCESSING) void _Semaphore_Core_mutex_mp_support ( Thread_Control *the_thread, rtems_id id ); +#endif /*PAGE * @@ -238,7 +240,9 @@ void _Semaphore_Core_semaphore_mp_support ( #ifndef __RTEMS_APPLICATION__ #include <rtems/rtems/sem.inl> #endif +#if defined(RTEMS_MULTIPROCESSING) #include <rtems/rtems/semmp.h> +#endif #ifdef __cplusplus } diff --git a/c/src/exec/rtems/include/rtems/rtems/signal.h b/c/src/exec/rtems/include/rtems/rtems/signal.h index 2b247762e9..c9424a2dfd 100644 --- a/c/src/exec/rtems/include/rtems/rtems/signal.h +++ b/c/src/exec/rtems/include/rtems/rtems/signal.h @@ -73,7 +73,9 @@ rtems_status_code rtems_signal_send( rtems_signal_set signal_set ); +#if defined(RTEMS_MULTIPROCESSING) #include <rtems/rtems/signalmp.h> +#endif #ifdef __cplusplus } diff --git a/c/src/exec/rtems/include/rtems/rtems/tasks.h b/c/src/exec/rtems/include/rtems/rtems/tasks.h index 17730cee7f..82506a5409 100644 --- a/c/src/exec/rtems/include/rtems/rtems/tasks.h +++ b/c/src/exec/rtems/include/rtems/rtems/tasks.h @@ -411,7 +411,9 @@ void _RTEMS_tasks_Initialize_user_tasks( void ); #ifndef __RTEMS_APPLICATION__ #include <rtems/rtems/tasks.inl> #endif +#if defined(RTEMS_MULTIPROCESSING) #include <rtems/rtems/taskmp.h> +#endif #ifdef __cplusplus } diff --git a/c/src/exec/rtems/include/rtems/rtems/types.h b/c/src/exec/rtems/include/rtems/rtems/types.h index 4d2915bafa..10165a6180 100644 --- a/c/src/exec/rtems/include/rtems/rtems/types.h +++ b/c/src/exec/rtems/include/rtems/rtems/types.h @@ -22,9 +22,13 @@ extern "C" { #include <rtems/score/object.h> #include <rtems/score/priority.h> +#include <rtems/score/tod.h> +#include <rtems/score/watchdog.h> #include <rtems/rtems/modes.h> +#if defined(RTEMS_MULTIPROCESSING) #include <rtems/score/mpci.h> #include <rtems/score/mppkt.h> +#endif /* * RTEMS basic type definitions @@ -75,6 +79,7 @@ typedef Modes_Control rtems_mode; * MPCI related entries */ +#if defined(RTEMS_MULTIPROCESSING) typedef MP_packet_Classes rtems_mp_packet_classes; typedef MP_packet_Prefix rtems_packet_prefix; @@ -87,6 +92,7 @@ typedef MPCI_receive_entry rtems_mpci_receive_packet_entry; typedef MPCI_Entry rtems_mpci_entry; typedef MPCI_Control rtems_mpci_table; +#endif #ifdef __cplusplus } |