diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-24 16:19:52 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-26 11:55:45 +0200 |
commit | fe6c170cf58c5e42a63010b5b4c985749cbc98a6 (patch) | |
tree | 8ece5b05395597d66a96c536b0ce13568aa9edb7 /cpukit/score | |
parent | score: Create thread implementation header (diff) | |
download | rtems-fe6c170cf58c5e42a63010b5b4c985749cbc98a6.tar.bz2 |
score: Create states implementation header
Move implementation specific parts of states.h and states.inl into new
header file statesimpl.h. The states.h contains now only the
application visible API.
Diffstat (limited to '')
47 files changed, 113 insertions, 171 deletions
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 5b33078edf..be493da0f1 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -56,6 +56,7 @@ include_rtems_score_HEADERS += include/rtems/score/smplock.h include_rtems_score_HEADERS += include/rtems/score/stack.h include_rtems_score_HEADERS += include/rtems/score/stackimpl.h include_rtems_score_HEADERS += include/rtems/score/states.h +include_rtems_score_HEADERS += include/rtems/score/statesimpl.h include_rtems_score_HEADERS += include/rtems/score/sysstate.h include_rtems_score_HEADERS += include/rtems/score/thread.h include_rtems_score_HEADERS += include/rtems/score/threadimpl.h @@ -100,7 +101,6 @@ endif ## inline include_rtems_score_HEADERS += inline/rtems/score/object.inl -include_rtems_score_HEADERS += inline/rtems/score/states.inl include_rtems_score_HEADERS += inline/rtems/score/threadq.inl include_rtems_score_HEADERS += inline/rtems/score/tod.inl include_rtems_score_HEADERS += inline/rtems/score/tqdata.inl diff --git a/cpukit/score/include/rtems/score/mpci.h b/cpukit/score/include/rtems/score/mpci.h index 16f6d36b20..0932c4763e 100644 --- a/cpukit/score/include/rtems/score/mpci.h +++ b/cpukit/score/include/rtems/score/mpci.h @@ -37,7 +37,6 @@ extern "C" { #endif #include <rtems/score/mppkt.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> #include <rtems/score/tqdata.h> diff --git a/cpukit/score/include/rtems/score/states.h b/cpukit/score/include/rtems/score/states.h index 9fab5d4748..89db185baf 100644 --- a/cpukit/score/include/rtems/score/states.h +++ b/cpukit/score/include/rtems/score/states.h @@ -18,6 +18,12 @@ #ifndef _RTEMS_SCORE_STATES_H #define _RTEMS_SCORE_STATES_H +#include <stdint.h> + +#ifdef __cplusplus +extern "C" { +#endif + /** * @defgroup ScoreStates SuperCore Thread States * @@ -28,105 +34,17 @@ */ /**@{*/ -#ifdef __cplusplus -extern "C" { -#endif - /** * The following type defines the control block used to manage a * thread's state. */ typedef uint32_t States_Control; -/* - * The following constants define the individual states which may be - * be used to compose and manipulate a thread's state. - */ - -/** This macro corresponds to all states being set. */ -#define STATES_ALL_SET 0xfffff -/** This macro corresponds to a task being ready. */ -#define STATES_READY 0x00000 -/** This macro corresponds to a task being created but not yet started. */ -#define STATES_DORMANT 0x00001 -/** This macro corresponds to a task being suspended. */ -#define STATES_SUSPENDED 0x00002 -/** This macro corresponds to a task being in an internal state transition. */ -#define STATES_TRANSIENT 0x00004 -/** This macro corresponds to a task which is waiting for a timeout. */ -#define STATES_DELAYING 0x00008 -/** This macro corresponds to a task waiting until a specific TOD. */ -#define STATES_WAITING_FOR_TIME 0x00010 -/** This macro corresponds to a task waiting for a variable length buffer. */ -#define STATES_WAITING_FOR_BUFFER 0x00020 -/** This macro corresponds to a task waiting for a fixed size segment. */ -#define STATES_WAITING_FOR_SEGMENT 0x00040 -/** This macro corresponds to a task waiting for a message. */ -#define STATES_WAITING_FOR_MESSAGE 0x00080 -/** This macro corresponds to a task waiting for an event. */ -#define STATES_WAITING_FOR_EVENT 0x00100 -/** This macro corresponds to a task waiting for a semaphore. */ -#define STATES_WAITING_FOR_SEMAPHORE 0x00200 -/** This macro corresponds to a task waiting for a mutex. */ -#define STATES_WAITING_FOR_MUTEX 0x00400 -/** This macro corresponds to a task waiting for a condition variable. */ -#define STATES_WAITING_FOR_CONDITION_VARIABLE 0x00800 -/** This macro corresponds to a task waiting for a join while exiting. */ -#define STATES_WAITING_FOR_JOIN_AT_EXIT 0x01000 -/** This macro corresponds to a task waiting for a reply to an MPCI request. */ -#define STATES_WAITING_FOR_RPC_REPLY 0x02000 -/** This macro corresponds to a task waiting for a period. */ -#define STATES_WAITING_FOR_PERIOD 0x04000 -/** This macro corresponds to a task waiting for a signal. */ -#define STATES_WAITING_FOR_SIGNAL 0x08000 -/** This macro corresponds to a task waiting for a barrier. */ -#define STATES_WAITING_FOR_BARRIER 0x10000 -/** This macro corresponds to a task waiting for a RWLock. */ -#define STATES_WAITING_FOR_RWLOCK 0x20000 -/** This macro corresponds to a task waiting for a system event. */ -#define STATES_WAITING_FOR_SYSTEM_EVENT 0x40000 - -/** This macro corresponds to a task which is in an interruptible - * blocking state. - */ -#define STATES_INTERRUPTIBLE_BY_SIGNAL 0x10000000 - -/** This macro corresponds to a task waiting for a local object operation. */ -#define STATES_LOCALLY_BLOCKED ( STATES_WAITING_FOR_BUFFER | \ - STATES_WAITING_FOR_SEGMENT | \ - STATES_WAITING_FOR_MESSAGE | \ - STATES_WAITING_FOR_SEMAPHORE | \ - STATES_WAITING_FOR_MUTEX | \ - STATES_WAITING_FOR_CONDITION_VARIABLE | \ - STATES_WAITING_FOR_JOIN_AT_EXIT | \ - STATES_WAITING_FOR_SIGNAL | \ - STATES_WAITING_FOR_BARRIER | \ - STATES_WAITING_FOR_RWLOCK ) - -/** This macro corresponds to a task waiting which is blocked on - * a thread queue. */ -#define STATES_WAITING_ON_THREAD_QUEUE \ - ( STATES_LOCALLY_BLOCKED | \ - STATES_WAITING_FOR_RPC_REPLY ) - -/** This macro corresponds to a task waiting which is blocked. */ -#define STATES_BLOCKED ( STATES_DELAYING | \ - STATES_WAITING_FOR_TIME | \ - STATES_WAITING_FOR_PERIOD | \ - STATES_WAITING_FOR_EVENT | \ - STATES_WAITING_FOR_SYSTEM_EVENT | \ - STATES_WAITING_ON_THREAD_QUEUE | \ - STATES_INTERRUPTIBLE_BY_SIGNAL ) - -#ifndef __RTEMS_APPLICATION__ -#include <rtems/score/states.inl> -#endif +/**@}*/ #ifdef __cplusplus } #endif -/**@}*/ - #endif /* end of include file */ diff --git a/cpukit/score/inline/rtems/score/states.inl b/cpukit/score/include/rtems/score/statesimpl.h index 5dfdc4230a..bc89753375 100644 --- a/cpukit/score/inline/rtems/score/states.inl +++ b/cpukit/score/include/rtems/score/statesimpl.h @@ -16,20 +16,101 @@ * http://www.rtems.com/license/LICENSE. */ -#ifndef _RTEMS_SCORE_STATES_H -# error "Never use <rtems/score/states.inl> directly; include <rtems/score/states.h> instead." -#endif +#ifndef _RTEMS_SCORE_STATESIMPL_H +#define _RTEMS_SCORE_STATESIMPL_H -#ifndef _RTEMS_SCORE_STATES_INL -#define _RTEMS_SCORE_STATES_INL +#include <rtems/score/states.h> +#include <rtems/score/basedefs.h> -#include <rtems/score/basedefs.h> /* RTEMS_INLINE_ROUTINE */ +#ifdef __cplusplus +extern "C" { +#endif /** * @addtogroup ScoreStates */ /**@{**/ +/* + * The following constants define the individual states which may be + * be used to compose and manipulate a thread's state. + */ + +/** This macro corresponds to all states being set. */ +#define STATES_ALL_SET 0xfffff +/** This macro corresponds to a task being ready. */ +#define STATES_READY 0x00000 +/** This macro corresponds to a task being created but not yet started. */ +#define STATES_DORMANT 0x00001 +/** This macro corresponds to a task being suspended. */ +#define STATES_SUSPENDED 0x00002 +/** This macro corresponds to a task being in an internal state transition. */ +#define STATES_TRANSIENT 0x00004 +/** This macro corresponds to a task which is waiting for a timeout. */ +#define STATES_DELAYING 0x00008 +/** This macro corresponds to a task waiting until a specific TOD. */ +#define STATES_WAITING_FOR_TIME 0x00010 +/** This macro corresponds to a task waiting for a variable length buffer. */ +#define STATES_WAITING_FOR_BUFFER 0x00020 +/** This macro corresponds to a task waiting for a fixed size segment. */ +#define STATES_WAITING_FOR_SEGMENT 0x00040 +/** This macro corresponds to a task waiting for a message. */ +#define STATES_WAITING_FOR_MESSAGE 0x00080 +/** This macro corresponds to a task waiting for an event. */ +#define STATES_WAITING_FOR_EVENT 0x00100 +/** This macro corresponds to a task waiting for a semaphore. */ +#define STATES_WAITING_FOR_SEMAPHORE 0x00200 +/** This macro corresponds to a task waiting for a mutex. */ +#define STATES_WAITING_FOR_MUTEX 0x00400 +/** This macro corresponds to a task waiting for a condition variable. */ +#define STATES_WAITING_FOR_CONDITION_VARIABLE 0x00800 +/** This macro corresponds to a task waiting for a join while exiting. */ +#define STATES_WAITING_FOR_JOIN_AT_EXIT 0x01000 +/** This macro corresponds to a task waiting for a reply to an MPCI request. */ +#define STATES_WAITING_FOR_RPC_REPLY 0x02000 +/** This macro corresponds to a task waiting for a period. */ +#define STATES_WAITING_FOR_PERIOD 0x04000 +/** This macro corresponds to a task waiting for a signal. */ +#define STATES_WAITING_FOR_SIGNAL 0x08000 +/** This macro corresponds to a task waiting for a barrier. */ +#define STATES_WAITING_FOR_BARRIER 0x10000 +/** This macro corresponds to a task waiting for a RWLock. */ +#define STATES_WAITING_FOR_RWLOCK 0x20000 +/** This macro corresponds to a task waiting for a system event. */ +#define STATES_WAITING_FOR_SYSTEM_EVENT 0x40000 + +/** This macro corresponds to a task which is in an interruptible + * blocking state. + */ +#define STATES_INTERRUPTIBLE_BY_SIGNAL 0x10000000 + +/** This macro corresponds to a task waiting for a local object operation. */ +#define STATES_LOCALLY_BLOCKED ( STATES_WAITING_FOR_BUFFER | \ + STATES_WAITING_FOR_SEGMENT | \ + STATES_WAITING_FOR_MESSAGE | \ + STATES_WAITING_FOR_SEMAPHORE | \ + STATES_WAITING_FOR_MUTEX | \ + STATES_WAITING_FOR_CONDITION_VARIABLE | \ + STATES_WAITING_FOR_JOIN_AT_EXIT | \ + STATES_WAITING_FOR_SIGNAL | \ + STATES_WAITING_FOR_BARRIER | \ + STATES_WAITING_FOR_RWLOCK ) + +/** This macro corresponds to a task waiting which is blocked on + * a thread queue. */ +#define STATES_WAITING_ON_THREAD_QUEUE \ + ( STATES_LOCALLY_BLOCKED | \ + STATES_WAITING_FOR_RPC_REPLY ) + +/** This macro corresponds to a task waiting which is blocked. */ +#define STATES_BLOCKED ( STATES_DELAYING | \ + STATES_WAITING_FOR_TIME | \ + STATES_WAITING_FOR_PERIOD | \ + STATES_WAITING_FOR_EVENT | \ + STATES_WAITING_FOR_SYSTEM_EVENT | \ + STATES_WAITING_ON_THREAD_QUEUE | \ + STATES_INTERRUPTIBLE_BY_SIGNAL ) + /** * This function sets the given states_to_set into the current_state * passed in. The result is returned to the user in current_state. @@ -388,5 +469,9 @@ RTEMS_INLINE_ROUTINE bool _States_Are_set ( /** @} */ +#ifdef __cplusplus +} +#endif + #endif /* end of include file */ diff --git a/cpukit/score/include/rtems/score/threadimpl.h b/cpukit/score/include/rtems/score/threadimpl.h index 205c704508..339ccd806e 100644 --- a/cpukit/score/include/rtems/score/threadimpl.h +++ b/cpukit/score/include/rtems/score/threadimpl.h @@ -20,6 +20,7 @@ #define _RTEMS_SCORE_THREADIMPL_H #include <rtems/score/thread.h> +#include <rtems/score/statesimpl.h> #ifdef __cplusplus extern "C" { diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am index e236716657..8536ec4bc0 100644 --- a/cpukit/score/preinstall.am +++ b/cpukit/score/preinstall.am @@ -207,6 +207,10 @@ $(PROJECT_INCLUDE)/rtems/score/states.h: include/rtems/score/states.h $(PROJECT_ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/states.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/states.h +$(PROJECT_INCLUDE)/rtems/score/statesimpl.h: include/rtems/score/statesimpl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/statesimpl.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/statesimpl.h + $(PROJECT_INCLUDE)/rtems/score/sysstate.h: include/rtems/score/sysstate.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sysstate.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sysstate.h @@ -331,10 +335,6 @@ $(PROJECT_INCLUDE)/rtems/score/object.inl: inline/rtems/score/object.inl $(PROJE $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/object.inl PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/object.inl -$(PROJECT_INCLUDE)/rtems/score/states.inl: inline/rtems/score/states.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/states.inl -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/states.inl - $(PROJECT_INCLUDE)/rtems/score/threadq.inl: inline/rtems/score/threadq.inl $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/threadq.inl PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threadq.inl diff --git a/cpukit/score/src/corebarrier.c b/cpukit/score/src/corebarrier.c index 4713207331..04bd875a56 100644 --- a/cpukit/score/src/corebarrier.c +++ b/cpukit/score/src/corebarrier.c @@ -18,9 +18,8 @@ #include "config.h" #endif -#include <rtems/system.h> #include <rtems/score/corebarrierimpl.h> -#include <rtems/score/states.h> +#include <rtems/score/statesimpl.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> diff --git a/cpukit/score/src/corebarrierrelease.c b/cpukit/score/src/corebarrierrelease.c index 2a27e4141f..12fc3bcba2 100644 --- a/cpukit/score/src/corebarrierrelease.c +++ b/cpukit/score/src/corebarrierrelease.c @@ -22,7 +22,6 @@ #include <rtems/system.h> #include <rtems/score/isr.h> #include <rtems/score/corebarrierimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> diff --git a/cpukit/score/src/corebarrierwait.c b/cpukit/score/src/corebarrierwait.c index 465402ab82..6ea1f250c2 100644 --- a/cpukit/score/src/corebarrierwait.c +++ b/cpukit/score/src/corebarrierwait.c @@ -21,7 +21,6 @@ #include <rtems/system.h> #include <rtems/score/isr.h> #include <rtems/score/corebarrierimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> diff --git a/cpukit/score/src/coremsg.c b/cpukit/score/src/coremsg.c index d620a5246d..72e1371b40 100644 --- a/cpukit/score/src/coremsg.c +++ b/cpukit/score/src/coremsg.c @@ -18,13 +18,9 @@ #include "config.h" #endif -#include <rtems/system.h> -#include <rtems/score/chain.h> -#include <rtems/score/isr.h> -#include <rtems/score/object.h> #include <rtems/score/coremsgimpl.h> -#include <rtems/score/states.h> -#include <rtems/score/thread.h> +#include <rtems/score/statesimpl.h> +#include <rtems/score/threadq.h> #include <rtems/score/wkspace.h> /* diff --git a/cpukit/score/src/coremsgbroadcast.c b/cpukit/score/src/coremsgbroadcast.c index 4591d0e336..d860eb11a8 100644 --- a/cpukit/score/src/coremsgbroadcast.c +++ b/cpukit/score/src/coremsgbroadcast.c @@ -23,7 +23,6 @@ #include <rtems/score/isr.h> #include <rtems/score/object.h> #include <rtems/score/coremsgimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/wkspace.h> diff --git a/cpukit/score/src/coremsgclose.c b/cpukit/score/src/coremsgclose.c index 367357c21a..946a4f5653 100644 --- a/cpukit/score/src/coremsgclose.c +++ b/cpukit/score/src/coremsgclose.c @@ -23,7 +23,6 @@ #include <rtems/score/isr.h> #include <rtems/score/object.h> #include <rtems/score/coremsgimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/wkspace.h> diff --git a/cpukit/score/src/coremsgflush.c b/cpukit/score/src/coremsgflush.c index 4185f4f2ed..169b1472f7 100644 --- a/cpukit/score/src/coremsgflush.c +++ b/cpukit/score/src/coremsgflush.c @@ -23,7 +23,6 @@ #include <rtems/score/isr.h> #include <rtems/score/object.h> #include <rtems/score/coremsgimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/wkspace.h> diff --git a/cpukit/score/src/coremsgflushsupp.c b/cpukit/score/src/coremsgflushsupp.c index dbc62ca3dd..436e77f2c6 100644 --- a/cpukit/score/src/coremsgflushsupp.c +++ b/cpukit/score/src/coremsgflushsupp.c @@ -24,7 +24,6 @@ #include <rtems/score/isr.h> #include <rtems/score/object.h> #include <rtems/score/coremsgimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/wkspace.h> diff --git a/cpukit/score/src/coremsgflushwait.c b/cpukit/score/src/coremsgflushwait.c index 5816ce8bda..4355239497 100644 --- a/cpukit/score/src/coremsgflushwait.c +++ b/cpukit/score/src/coremsgflushwait.c @@ -24,7 +24,6 @@ #include <rtems/score/isr.h> #include <rtems/score/object.h> #include <rtems/score/coremsgimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/wkspace.h> diff --git a/cpukit/score/src/coremsginsert.c b/cpukit/score/src/coremsginsert.c index 69836df593..fca5f07150 100644 --- a/cpukit/score/src/coremsginsert.c +++ b/cpukit/score/src/coremsginsert.c @@ -23,7 +23,6 @@ #include <rtems/score/isr.h> #include <rtems/score/object.h> #include <rtems/score/coremsgimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/wkspace.h> diff --git a/cpukit/score/src/coremsgseize.c b/cpukit/score/src/coremsgseize.c index 5d64616ace..24d6f573a2 100644 --- a/cpukit/score/src/coremsgseize.c +++ b/cpukit/score/src/coremsgseize.c @@ -23,7 +23,6 @@ #include <rtems/score/isr.h> #include <rtems/score/object.h> #include <rtems/score/coremsgimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/wkspace.h> diff --git a/cpukit/score/src/coremsgsubmit.c b/cpukit/score/src/coremsgsubmit.c index 6acaadab89..09982dc2a5 100644 --- a/cpukit/score/src/coremsgsubmit.c +++ b/cpukit/score/src/coremsgsubmit.c @@ -24,7 +24,6 @@ #include <rtems/score/isr.h> #include <rtems/score/object.h> #include <rtems/score/coremsgimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/wkspace.h> diff --git a/cpukit/score/src/coremutex.c b/cpukit/score/src/coremutex.c index 8ea7d13a4d..1d0f596867 100644 --- a/cpukit/score/src/coremutex.c +++ b/cpukit/score/src/coremutex.c @@ -21,7 +21,6 @@ #include <rtems/system.h> #include <rtems/score/isr.h> #include <rtems/score/coremuteximpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> diff --git a/cpukit/score/src/coremutexflush.c b/cpukit/score/src/coremutexflush.c index 5aec9e54af..5e87f0c201 100644 --- a/cpukit/score/src/coremutexflush.c +++ b/cpukit/score/src/coremutexflush.c @@ -21,7 +21,6 @@ #include <rtems/system.h> #include <rtems/score/isr.h> #include <rtems/score/coremuteximpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> diff --git a/cpukit/score/src/coremutexseize.c b/cpukit/score/src/coremutexseize.c index dee9f7d5f7..dc74beefe3 100644 --- a/cpukit/score/src/coremutexseize.c +++ b/cpukit/score/src/coremutexseize.c @@ -22,7 +22,6 @@ #include <rtems/score/isr.h> #include <rtems/score/coremuteximpl.h> #include <rtems/score/schedulerimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> diff --git a/cpukit/score/src/coremutexseizeintr.c b/cpukit/score/src/coremutexseizeintr.c index cc726b6135..70101d0899 100644 --- a/cpukit/score/src/coremutexseizeintr.c +++ b/cpukit/score/src/coremutexseizeintr.c @@ -21,7 +21,6 @@ #include <rtems/system.h> #include <rtems/score/isr.h> #include <rtems/score/coremuteximpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> diff --git a/cpukit/score/src/coremutexsurrender.c b/cpukit/score/src/coremutexsurrender.c index 12f84d310c..e411f77f9f 100644 --- a/cpukit/score/src/coremutexsurrender.c +++ b/cpukit/score/src/coremutexsurrender.c @@ -21,7 +21,6 @@ #include <rtems/system.h> #include <rtems/score/isr.h> #include <rtems/score/coremuteximpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> diff --git a/cpukit/score/src/corerwlock.c b/cpukit/score/src/corerwlock.c index 1f70bc662e..2d49e836d8 100644 --- a/cpukit/score/src/corerwlock.c +++ b/cpukit/score/src/corerwlock.c @@ -18,10 +18,8 @@ #include "config.h" #endif -#include <rtems/system.h> #include <rtems/score/corerwlockimpl.h> -#include <rtems/score/states.h> -#include <rtems/score/thread.h> +#include <rtems/score/statesimpl.h> #include <rtems/score/threadq.h> void _CORE_RWLock_Initialize( diff --git a/cpukit/score/src/corerwlockobtainread.c b/cpukit/score/src/corerwlockobtainread.c index 2447360636..fc3ce24140 100644 --- a/cpukit/score/src/corerwlockobtainread.c +++ b/cpukit/score/src/corerwlockobtainread.c @@ -20,7 +20,6 @@ #include <rtems/system.h> #include <rtems/score/corerwlockimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/watchdog.h> diff --git a/cpukit/score/src/corerwlockobtainwrite.c b/cpukit/score/src/corerwlockobtainwrite.c index 1eca63c7ed..8c00a8f975 100644 --- a/cpukit/score/src/corerwlockobtainwrite.c +++ b/cpukit/score/src/corerwlockobtainwrite.c @@ -20,7 +20,6 @@ #include <rtems/system.h> #include <rtems/score/corerwlockimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/watchdog.h> diff --git a/cpukit/score/src/corerwlockrelease.c b/cpukit/score/src/corerwlockrelease.c index c0b23e08e3..245390a4df 100644 --- a/cpukit/score/src/corerwlockrelease.c +++ b/cpukit/score/src/corerwlockrelease.c @@ -21,7 +21,6 @@ #include <rtems/system.h> #include <rtems/score/corerwlockimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/watchdog.h> diff --git a/cpukit/score/src/coresem.c b/cpukit/score/src/coresem.c index 46d0334693..0257c121ea 100644 --- a/cpukit/score/src/coresem.c +++ b/cpukit/score/src/coresem.c @@ -18,11 +18,8 @@ #include "config.h" #endif -#include <rtems/system.h> -#include <rtems/score/isr.h> #include <rtems/score/coresemimpl.h> -#include <rtems/score/states.h> -#include <rtems/score/thread.h> +#include <rtems/score/statesimpl.h> #include <rtems/score/threadq.h> void _CORE_semaphore_Initialize( diff --git a/cpukit/score/src/coresemflush.c b/cpukit/score/src/coresemflush.c index c1b68a72c0..4c691c8546 100644 --- a/cpukit/score/src/coresemflush.c +++ b/cpukit/score/src/coresemflush.c @@ -21,7 +21,6 @@ #include <rtems/system.h> #include <rtems/score/isr.h> #include <rtems/score/coresemimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> diff --git a/cpukit/score/src/coresemseize.c b/cpukit/score/src/coresemseize.c index 8da9ca3044..5ed5ee68ba 100644 --- a/cpukit/score/src/coresemseize.c +++ b/cpukit/score/src/coresemseize.c @@ -22,7 +22,6 @@ #include <rtems/system.h> #include <rtems/score/isr.h> #include <rtems/score/coresemimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> diff --git a/cpukit/score/src/coresemsurrender.c b/cpukit/score/src/coresemsurrender.c index 2a8d208a8d..59fdbebafc 100644 --- a/cpukit/score/src/coresemsurrender.c +++ b/cpukit/score/src/coresemsurrender.c @@ -22,7 +22,6 @@ #include <rtems/system.h> #include <rtems/score/isr.h> #include <rtems/score/coresemimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> diff --git a/cpukit/score/src/corespinlock.c b/cpukit/score/src/corespinlock.c index 013178b501..0b4dba303f 100644 --- a/cpukit/score/src/corespinlock.c +++ b/cpukit/score/src/corespinlock.c @@ -21,7 +21,6 @@ #include <rtems/system.h> #include <rtems/score/corespinlockimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> diff --git a/cpukit/score/src/corespinlockrelease.c b/cpukit/score/src/corespinlockrelease.c index b2c9b53021..a9c39bc65e 100644 --- a/cpukit/score/src/corespinlockrelease.c +++ b/cpukit/score/src/corespinlockrelease.c @@ -20,7 +20,6 @@ #include <rtems/system.h> #include <rtems/score/corespinlockimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/watchdog.h> diff --git a/cpukit/score/src/corespinlockwait.c b/cpukit/score/src/corespinlockwait.c index 689180a218..b8cb58fa1c 100644 --- a/cpukit/score/src/corespinlockwait.c +++ b/cpukit/score/src/corespinlockwait.c @@ -20,7 +20,6 @@ #include <rtems/system.h> #include <rtems/score/corespinlockimpl.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threaddispatch.h> diff --git a/cpukit/score/src/mpci.c b/cpukit/score/src/mpci.c index 4cfdc85f7f..043f243607 100644 --- a/cpukit/score/src/mpci.c +++ b/cpukit/score/src/mpci.c @@ -26,7 +26,6 @@ #include <rtems/config.h> #include <rtems/score/cpu.h> #include <rtems/score/interr.h> -#include <rtems/score/states.h> #include <rtems/score/threadimpl.h> #include <rtems/score/threadq.h> #include <rtems/score/tqdata.h> diff --git a/cpukit/score/src/threaddispatchdisablelevel.c b/cpukit/score/src/threaddispatchdisablelevel.c index 439a6e6a32..d15f4b1862 100644 --- a/cpukit/score/src/threaddispatchdisablelevel.c +++ b/cpukit/score/src/threaddispatchdisablelevel.c @@ -22,7 +22,6 @@ #include <rtems/score/isr.h> #include <rtems/score/object.h> #include <rtems/score/priority.h> -#include <rtems/score/states.h> #include <rtems/score/threaddispatch.h> #define NO_OWNER_CPU 0xffffffffU diff --git a/cpukit/score/src/threadq.c b/cpukit/score/src/threadq.c index 4563f0ffff..c5e694e9f3 100644 --- a/cpukit/score/src/threadq.c +++ b/cpukit/score/src/threadq.c @@ -22,7 +22,6 @@ #include <rtems/score/chainimpl.h> #include <rtems/score/isr.h> #include <rtems/score/object.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> #include <rtems/score/tqdata.h> diff --git a/cpukit/score/src/threadqdequeue.c b/cpukit/score/src/threadqdequeue.c index 93675fb16d..4cdc8edb90 100644 --- a/cpukit/score/src/threadqdequeue.c +++ b/cpukit/score/src/threadqdequeue.c @@ -23,7 +23,6 @@ #include <rtems/score/chain.h> #include <rtems/score/isr.h> #include <rtems/score/object.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> #include <rtems/score/tqdata.h> diff --git a/cpukit/score/src/threadqenqueuefifo.c b/cpukit/score/src/threadqenqueuefifo.c index 44bdfd5988..91c6466073 100644 --- a/cpukit/score/src/threadqenqueuefifo.c +++ b/cpukit/score/src/threadqenqueuefifo.c @@ -22,7 +22,6 @@ #include <rtems/score/chainimpl.h> #include <rtems/score/isr.h> #include <rtems/score/object.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> #include <rtems/score/tqdata.h> diff --git a/cpukit/score/src/threadqenqueuepriority.c b/cpukit/score/src/threadqenqueuepriority.c index 57117028dc..a9d0c6bf3d 100644 --- a/cpukit/score/src/threadqenqueuepriority.c +++ b/cpukit/score/src/threadqenqueuepriority.c @@ -18,14 +18,9 @@ #include "config.h" #endif -#include <rtems/system.h> -#include <rtems/score/chainimpl.h> -#include <rtems/score/isr.h> -#include <rtems/score/object.h> -#include <rtems/score/states.h> -#include <rtems/score/thread.h> #include <rtems/score/threadq.h> -#include <rtems/score/tqdata.h> +#include <rtems/score/chainimpl.h> +#include <rtems/score/statesimpl.h> /* * Support the user forcing the unrolling to be disabled. diff --git a/cpukit/score/src/threadqextract.c b/cpukit/score/src/threadqextract.c index 3b6aac58de..9d0d40ccae 100644 --- a/cpukit/score/src/threadqextract.c +++ b/cpukit/score/src/threadqextract.c @@ -23,7 +23,6 @@ #include <rtems/score/chain.h> #include <rtems/score/isr.h> #include <rtems/score/object.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> #include <rtems/score/tqdata.h> diff --git a/cpukit/score/src/threadqextractwithproxy.c b/cpukit/score/src/threadqextractwithproxy.c index 7c8b84ba46..d7245e5f59 100644 --- a/cpukit/score/src/threadqextractwithproxy.c +++ b/cpukit/score/src/threadqextractwithproxy.c @@ -23,14 +23,8 @@ #include "config.h" #endif -#include <rtems/system.h> -#include <rtems/score/chain.h> -#include <rtems/score/isr.h> -#include <rtems/score/object.h> -#include <rtems/score/states.h> -#include <rtems/score/thread.h> #include <rtems/score/threadq.h> -#include <rtems/score/tqdata.h> +#include <rtems/score/statesimpl.h> bool _Thread_queue_Extract_with_proxy( Thread_Control *the_thread diff --git a/cpukit/score/src/threadqfirst.c b/cpukit/score/src/threadqfirst.c index ef8a13175d..1108188917 100644 --- a/cpukit/score/src/threadqfirst.c +++ b/cpukit/score/src/threadqfirst.c @@ -22,7 +22,6 @@ #include <rtems/score/chain.h> #include <rtems/score/isr.h> #include <rtems/score/object.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> #include <rtems/score/tqdata.h> diff --git a/cpukit/score/src/threadqfirstfifo.c b/cpukit/score/src/threadqfirstfifo.c index 08d90ce1c0..9b47302ed9 100644 --- a/cpukit/score/src/threadqfirstfifo.c +++ b/cpukit/score/src/threadqfirstfifo.c @@ -22,7 +22,6 @@ #include <rtems/score/chainimpl.h> #include <rtems/score/isr.h> #include <rtems/score/object.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> #include <rtems/score/tqdata.h> diff --git a/cpukit/score/src/threadqfirstpriority.c b/cpukit/score/src/threadqfirstpriority.c index 5b2d56a30e..4a75a8b812 100644 --- a/cpukit/score/src/threadqfirstpriority.c +++ b/cpukit/score/src/threadqfirstpriority.c @@ -26,7 +26,6 @@ #include <rtems/score/chainimpl.h> #include <rtems/score/isr.h> #include <rtems/score/object.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> #include <rtems/score/tqdata.h> diff --git a/cpukit/score/src/threadqflush.c b/cpukit/score/src/threadqflush.c index 8209d5802c..46eb8391d9 100644 --- a/cpukit/score/src/threadqflush.c +++ b/cpukit/score/src/threadqflush.c @@ -22,7 +22,6 @@ #include <rtems/score/chain.h> #include <rtems/score/isr.h> #include <rtems/score/object.h> -#include <rtems/score/states.h> #include <rtems/score/thread.h> #include <rtems/score/threadq.h> #include <rtems/score/tqdata.h> diff --git a/cpukit/score/src/threadqrequeue.c b/cpukit/score/src/threadqrequeue.c index 15cf0119b4..c2a8cad5b7 100644 --- a/cpukit/score/src/threadqrequeue.c +++ b/cpukit/score/src/threadqrequeue.c @@ -18,14 +18,8 @@ #include "config.h" #endif -#include <rtems/system.h> -#include <rtems/score/chain.h> -#include <rtems/score/isr.h> -#include <rtems/score/object.h> -#include <rtems/score/states.h> -#include <rtems/score/thread.h> #include <rtems/score/threadq.h> -#include <rtems/score/tqdata.h> +#include <rtems/score/statesimpl.h> void _Thread_queue_Requeue( Thread_queue_Control *the_thread_queue, |