diff options
-rw-r--r-- | c/src/exec/rtems/headers/rtems.h | 2 | ||||
-rw-r--r-- | c/src/exec/rtems/include/rtems.h | 2 | ||||
-rw-r--r-- | c/src/exec/score/headers/object.h | 2 | ||||
-rw-r--r-- | c/src/exec/score/headers/objectmp.h | 2 | ||||
-rw-r--r-- | c/src/exec/score/headers/sysstate.h | 2 | ||||
-rw-r--r-- | c/src/exec/score/include/rtems/score/object.h | 2 | ||||
-rw-r--r-- | c/src/exec/score/include/rtems/score/objectmp.h | 2 | ||||
-rw-r--r-- | c/src/exec/score/include/rtems/score/sysstate.h | 2 | ||||
-rw-r--r-- | c/src/exec/score/src/coremsg.c | 11 | ||||
-rw-r--r-- | c/src/exec/score/src/heap.c | 2 | ||||
-rw-r--r-- | c/src/exec/score/src/interr.c | 2 | ||||
-rw-r--r-- | c/src/exec/score/src/mpci.c | 2 | ||||
-rw-r--r-- | c/src/exec/score/src/object.c | 4 | ||||
-rw-r--r-- | cpukit/rtems/include/rtems.h | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/object.h | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/objectmp.h | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/score/sysstate.h | 2 | ||||
-rw-r--r-- | cpukit/score/src/coremsg.c | 11 | ||||
-rw-r--r-- | cpukit/score/src/heap.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/interr.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/mpci.c | 2 | ||||
-rw-r--r-- | cpukit/score/src/object.c | 4 |
22 files changed, 28 insertions, 38 deletions
diff --git a/c/src/exec/rtems/headers/rtems.h b/c/src/exec/rtems/headers/rtems.h index 519d9416d2..dd6350c9d8 100644 --- a/c/src/exec/rtems/headers/rtems.h +++ b/c/src/exec/rtems/headers/rtems.h @@ -48,7 +48,7 @@ extern "C" { #include <rtems/rtems/mp.h> #include <rtems/rtems/support.h> -#include <rtems/sysstate.h> +#include <rtems/core/sysstate.h> #define RTEMS_HAS_HARDWARE_FP CPU_HARDWARE_FP diff --git a/c/src/exec/rtems/include/rtems.h b/c/src/exec/rtems/include/rtems.h index 519d9416d2..dd6350c9d8 100644 --- a/c/src/exec/rtems/include/rtems.h +++ b/c/src/exec/rtems/include/rtems.h @@ -48,7 +48,7 @@ extern "C" { #include <rtems/rtems/mp.h> #include <rtems/rtems/support.h> -#include <rtems/sysstate.h> +#include <rtems/core/sysstate.h> #define RTEMS_HAS_HARDWARE_FP CPU_HARDWARE_FP diff --git a/c/src/exec/score/headers/object.h b/c/src/exec/score/headers/object.h index 3da299e95f..c64b15d786 100644 --- a/c/src/exec/score/headers/object.h +++ b/c/src/exec/score/headers/object.h @@ -545,7 +545,7 @@ STATIC INLINE void _Objects_Close( ); #include <rtems/core/object.inl> -#include <rtems/objectmp.h> +#include <rtems/core/objectmp.h> #ifdef __cplusplus } diff --git a/c/src/exec/score/headers/objectmp.h b/c/src/exec/score/headers/objectmp.h index cef5c6879d..324cc59472 100644 --- a/c/src/exec/score/headers/objectmp.h +++ b/c/src/exec/score/headers/objectmp.h @@ -176,7 +176,7 @@ void _Objects_MP_Is_remote ( EXTERN unsigned32 _Objects_MP_Maximum_global_objects; EXTERN Chain_Control _Objects_MP_Inactive_global_objects; -#include <rtems/objectmp.inl> +#include <rtems/core/objectmp.inl> #ifdef __cplusplus } diff --git a/c/src/exec/score/headers/sysstate.h b/c/src/exec/score/headers/sysstate.h index b0ace61f98..59d6c955e9 100644 --- a/c/src/exec/score/headers/sysstate.h +++ b/c/src/exec/score/headers/sysstate.h @@ -152,7 +152,7 @@ STATIC INLINE boolean _System_state_Is_failed ( System_state_Codes state ); -#include <rtems/sysstate.inl> +#include <rtems/core/sysstate.inl> #ifdef __cplusplus } diff --git a/c/src/exec/score/include/rtems/score/object.h b/c/src/exec/score/include/rtems/score/object.h index 3da299e95f..c64b15d786 100644 --- a/c/src/exec/score/include/rtems/score/object.h +++ b/c/src/exec/score/include/rtems/score/object.h @@ -545,7 +545,7 @@ STATIC INLINE void _Objects_Close( ); #include <rtems/core/object.inl> -#include <rtems/objectmp.h> +#include <rtems/core/objectmp.h> #ifdef __cplusplus } diff --git a/c/src/exec/score/include/rtems/score/objectmp.h b/c/src/exec/score/include/rtems/score/objectmp.h index cef5c6879d..324cc59472 100644 --- a/c/src/exec/score/include/rtems/score/objectmp.h +++ b/c/src/exec/score/include/rtems/score/objectmp.h @@ -176,7 +176,7 @@ void _Objects_MP_Is_remote ( EXTERN unsigned32 _Objects_MP_Maximum_global_objects; EXTERN Chain_Control _Objects_MP_Inactive_global_objects; -#include <rtems/objectmp.inl> +#include <rtems/core/objectmp.inl> #ifdef __cplusplus } diff --git a/c/src/exec/score/include/rtems/score/sysstate.h b/c/src/exec/score/include/rtems/score/sysstate.h index b0ace61f98..59d6c955e9 100644 --- a/c/src/exec/score/include/rtems/score/sysstate.h +++ b/c/src/exec/score/include/rtems/score/sysstate.h @@ -152,7 +152,7 @@ STATIC INLINE boolean _System_state_Is_failed ( System_state_Codes state ); -#include <rtems/sysstate.inl> +#include <rtems/core/sysstate.inl> #ifdef __cplusplus } diff --git a/c/src/exec/score/src/coremsg.c b/c/src/exec/score/src/coremsg.c index 2ce0587b5f..e7e37ec474 100644 --- a/c/src/exec/score/src/coremsg.c +++ b/c/src/exec/score/src/coremsg.c @@ -19,19 +19,14 @@ */ #include <rtems/system.h> -#include <rtems/rtems/status.h> -#include <rtems/rtems/attr.h> #include <rtems/core/chain.h> #include <rtems/core/isr.h> -#include <rtems/rtems/message.h> #include <rtems/core/object.h> -#include <rtems/rtems/options.h> +#include <rtems/core/coremsg.h> #include <rtems/core/states.h> -#include <rtems/rtems/support.h> #include <rtems/core/thread.h> #include <rtems/core/wkspace.h> #include <rtems/core/mpci.h> -#include <rtems/sysstate.h> /*PAGE * @@ -219,7 +214,7 @@ CORE_message_queue_Status _CORE_message_queue_Broadcast( constrained_size ); - *(rtems_unsigned32 *)the_thread->Wait.return_argument_1 = size; + *(unsigned32 *)the_thread->Wait.return_argument_1 = size; if ( !_Objects_Is_local_id( the_thread->Object.id ) ) (*api_message_queue_mp_support) ( the_thread, id ); @@ -396,7 +391,7 @@ CORE_message_queue_Status _CORE_message_queue_Submit( the_thread->Wait.return_argument, size ); - *(rtems_unsigned32 *)the_thread->Wait.return_argument_1 = size; + *(unsigned32 *)the_thread->Wait.return_argument_1 = size; if ( !_Objects_Is_local_id( the_thread->Object.id ) ) (*api_message_queue_mp_support) ( the_thread, id ); diff --git a/c/src/exec/score/src/heap.c b/c/src/exec/score/src/heap.c index 0820d2ead4..37ed035af2 100644 --- a/c/src/exec/score/src/heap.c +++ b/c/src/exec/score/src/heap.c @@ -14,7 +14,7 @@ #include <rtems/system.h> -#include <rtems/sysstate.h> +#include <rtems/core/sysstate.h> #include <rtems/core/heap.h> /*PAGE diff --git a/c/src/exec/score/src/interr.c b/c/src/exec/score/src/interr.c index 3eb2bc1746..028e3cdb19 100644 --- a/c/src/exec/score/src/interr.c +++ b/c/src/exec/score/src/interr.c @@ -14,7 +14,7 @@ #include <rtems/system.h> #include <rtems/core/interr.h> -#include <rtems/sysstate.h> +#include <rtems/core/sysstate.h> #include <rtems/core/userext.h> /*PAGE diff --git a/c/src/exec/score/src/mpci.c b/c/src/exec/score/src/mpci.c index 33bfee80c5..b2e183765d 100644 --- a/c/src/exec/score/src/mpci.c +++ b/c/src/exec/score/src/mpci.c @@ -23,7 +23,7 @@ #include <rtems/core/threadq.h> #include <rtems/core/tqdata.h> #include <rtems/core/watchdog.h> -#include <rtems/sysstate.h> +#include <rtems/core/sysstate.h> #include <rtems/core/coresem.h> diff --git a/c/src/exec/score/src/object.c b/c/src/exec/score/src/object.c index 7ff6aa5204..0fbe287842 100644 --- a/c/src/exec/score/src/object.c +++ b/c/src/exec/score/src/object.c @@ -16,10 +16,10 @@ #include <rtems/system.h> #include <rtems/core/chain.h> #include <rtems/core/object.h> -#include <rtems/objectmp.h> +#include <rtems/core/objectmp.h> #include <rtems/core/thread.h> #include <rtems/core/wkspace.h> -#include <rtems/sysstate.h> +#include <rtems/core/sysstate.h> /*PAGE * diff --git a/cpukit/rtems/include/rtems.h b/cpukit/rtems/include/rtems.h index 519d9416d2..dd6350c9d8 100644 --- a/cpukit/rtems/include/rtems.h +++ b/cpukit/rtems/include/rtems.h @@ -48,7 +48,7 @@ extern "C" { #include <rtems/rtems/mp.h> #include <rtems/rtems/support.h> -#include <rtems/sysstate.h> +#include <rtems/core/sysstate.h> #define RTEMS_HAS_HARDWARE_FP CPU_HARDWARE_FP diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h index 3da299e95f..c64b15d786 100644 --- a/cpukit/score/include/rtems/score/object.h +++ b/cpukit/score/include/rtems/score/object.h @@ -545,7 +545,7 @@ STATIC INLINE void _Objects_Close( ); #include <rtems/core/object.inl> -#include <rtems/objectmp.h> +#include <rtems/core/objectmp.h> #ifdef __cplusplus } diff --git a/cpukit/score/include/rtems/score/objectmp.h b/cpukit/score/include/rtems/score/objectmp.h index cef5c6879d..324cc59472 100644 --- a/cpukit/score/include/rtems/score/objectmp.h +++ b/cpukit/score/include/rtems/score/objectmp.h @@ -176,7 +176,7 @@ void _Objects_MP_Is_remote ( EXTERN unsigned32 _Objects_MP_Maximum_global_objects; EXTERN Chain_Control _Objects_MP_Inactive_global_objects; -#include <rtems/objectmp.inl> +#include <rtems/core/objectmp.inl> #ifdef __cplusplus } diff --git a/cpukit/score/include/rtems/score/sysstate.h b/cpukit/score/include/rtems/score/sysstate.h index b0ace61f98..59d6c955e9 100644 --- a/cpukit/score/include/rtems/score/sysstate.h +++ b/cpukit/score/include/rtems/score/sysstate.h @@ -152,7 +152,7 @@ STATIC INLINE boolean _System_state_Is_failed ( System_state_Codes state ); -#include <rtems/sysstate.inl> +#include <rtems/core/sysstate.inl> #ifdef __cplusplus } diff --git a/cpukit/score/src/coremsg.c b/cpukit/score/src/coremsg.c index 2ce0587b5f..e7e37ec474 100644 --- a/cpukit/score/src/coremsg.c +++ b/cpukit/score/src/coremsg.c @@ -19,19 +19,14 @@ */ #include <rtems/system.h> -#include <rtems/rtems/status.h> -#include <rtems/rtems/attr.h> #include <rtems/core/chain.h> #include <rtems/core/isr.h> -#include <rtems/rtems/message.h> #include <rtems/core/object.h> -#include <rtems/rtems/options.h> +#include <rtems/core/coremsg.h> #include <rtems/core/states.h> -#include <rtems/rtems/support.h> #include <rtems/core/thread.h> #include <rtems/core/wkspace.h> #include <rtems/core/mpci.h> -#include <rtems/sysstate.h> /*PAGE * @@ -219,7 +214,7 @@ CORE_message_queue_Status _CORE_message_queue_Broadcast( constrained_size ); - *(rtems_unsigned32 *)the_thread->Wait.return_argument_1 = size; + *(unsigned32 *)the_thread->Wait.return_argument_1 = size; if ( !_Objects_Is_local_id( the_thread->Object.id ) ) (*api_message_queue_mp_support) ( the_thread, id ); @@ -396,7 +391,7 @@ CORE_message_queue_Status _CORE_message_queue_Submit( the_thread->Wait.return_argument, size ); - *(rtems_unsigned32 *)the_thread->Wait.return_argument_1 = size; + *(unsigned32 *)the_thread->Wait.return_argument_1 = size; if ( !_Objects_Is_local_id( the_thread->Object.id ) ) (*api_message_queue_mp_support) ( the_thread, id ); diff --git a/cpukit/score/src/heap.c b/cpukit/score/src/heap.c index 0820d2ead4..37ed035af2 100644 --- a/cpukit/score/src/heap.c +++ b/cpukit/score/src/heap.c @@ -14,7 +14,7 @@ #include <rtems/system.h> -#include <rtems/sysstate.h> +#include <rtems/core/sysstate.h> #include <rtems/core/heap.h> /*PAGE diff --git a/cpukit/score/src/interr.c b/cpukit/score/src/interr.c index 3eb2bc1746..028e3cdb19 100644 --- a/cpukit/score/src/interr.c +++ b/cpukit/score/src/interr.c @@ -14,7 +14,7 @@ #include <rtems/system.h> #include <rtems/core/interr.h> -#include <rtems/sysstate.h> +#include <rtems/core/sysstate.h> #include <rtems/core/userext.h> /*PAGE diff --git a/cpukit/score/src/mpci.c b/cpukit/score/src/mpci.c index 33bfee80c5..b2e183765d 100644 --- a/cpukit/score/src/mpci.c +++ b/cpukit/score/src/mpci.c @@ -23,7 +23,7 @@ #include <rtems/core/threadq.h> #include <rtems/core/tqdata.h> #include <rtems/core/watchdog.h> -#include <rtems/sysstate.h> +#include <rtems/core/sysstate.h> #include <rtems/core/coresem.h> diff --git a/cpukit/score/src/object.c b/cpukit/score/src/object.c index 7ff6aa5204..0fbe287842 100644 --- a/cpukit/score/src/object.c +++ b/cpukit/score/src/object.c @@ -16,10 +16,10 @@ #include <rtems/system.h> #include <rtems/core/chain.h> #include <rtems/core/object.h> -#include <rtems/objectmp.h> +#include <rtems/core/objectmp.h> #include <rtems/core/thread.h> #include <rtems/core/wkspace.h> -#include <rtems/sysstate.h> +#include <rtems/core/sysstate.h> /*PAGE * |