From 4fc370e3c64c510d43d1e8808d664513baca2ad7 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Wed, 5 Jun 2013 12:08:23 +0200
Subject: score: Move thread dispatch content to new file

Move thread dispatch declarations and inline functions to new header
<rtems/score/threaddispatch.h> to make it independent of the
Thread_Control structure.  This avoids a cyclic dependency in case
thread dispatch functions are used for the object implementation.
---
 cpukit/score/src/corerwlocktimeout.c              | 2 +-
 cpukit/score/src/corespinlockwait.c               | 1 +
 cpukit/score/src/coretodset.c                     | 1 +
 cpukit/score/src/isrsmp.c                         | 1 +
 cpukit/score/src/schedulercbsattachthread.c       | 1 +
 cpukit/score/src/schedulercbsdetachthread.c       | 1 +
 cpukit/score/src/schedulercbsgetexecutiontime.c   | 1 +
 cpukit/score/src/schedulercbsgetremainingbudget.c | 1 +
 cpukit/score/src/smp.c                            | 1 +
 cpukit/score/src/threadclose.c                    | 1 +
 cpukit/score/src/threaddelayended.c               | 1 +
 cpukit/score/src/threaddisabledispatch.c          | 1 +
 cpukit/score/src/threaddispatch.c                 | 1 +
 cpukit/score/src/threaddispatchdisablelevel.c     | 2 +-
 cpukit/score/src/threadget.c                      | 1 +
 cpukit/score/src/threadhandler.c                  | 1 +
 cpukit/score/src/threadqtimeout.c                 | 1 +
 17 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'cpukit/score/src')

diff --git a/cpukit/score/src/corerwlocktimeout.c b/cpukit/score/src/corerwlocktimeout.c
index b5cd4b0786..73e93f8eb0 100644
--- a/cpukit/score/src/corerwlocktimeout.c
+++ b/cpukit/score/src/corerwlocktimeout.c
@@ -20,7 +20,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/corerwlock.h>
-#include <rtems/score/corerwlock.h>
+#include <rtems/score/threaddispatch.h>
 
 void _CORE_RWLock_Timeout(
   Objects_Id  id,
diff --git a/cpukit/score/src/corespinlockwait.c b/cpukit/score/src/corespinlockwait.c
index fa2fb11216..6e71a1fed6 100644
--- a/cpukit/score/src/corespinlockwait.c
+++ b/cpukit/score/src/corespinlockwait.c
@@ -22,6 +22,7 @@
 #include <rtems/score/corespinlock.h>
 #include <rtems/score/states.h>
 #include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/watchdog.h>
 
 /*
diff --git a/cpukit/score/src/coretodset.c b/cpukit/score/src/coretodset.c
index 57a7d45d37..b141e2819a 100644
--- a/cpukit/score/src/coretodset.c
+++ b/cpukit/score/src/coretodset.c
@@ -21,6 +21,7 @@
 #include <rtems/system.h>
 #include <rtems/score/object.h>
 #include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/timestamp.h>
 #include <rtems/score/tod.h>
 #include <rtems/score/watchdog.h>
diff --git a/cpukit/score/src/isrsmp.c b/cpukit/score/src/isrsmp.c
index 7fb3f75bc3..92442875aa 100644
--- a/cpukit/score/src/isrsmp.c
+++ b/cpukit/score/src/isrsmp.c
@@ -21,6 +21,7 @@
 #include <rtems/system.h>
 #include <rtems/score/isr.h>
 #include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/smp.h>
 
 void _ISR_SMP_Initialize(void)
diff --git a/cpukit/score/src/schedulercbsattachthread.c b/cpukit/score/src/schedulercbsattachthread.c
index 56602a22d1..5a9ba04721 100644
--- a/cpukit/score/src/schedulercbsattachthread.c
+++ b/cpukit/score/src/schedulercbsattachthread.c
@@ -22,6 +22,7 @@
 #include <rtems/config.h>
 #include <rtems/score/scheduler.h>
 #include <rtems/score/schedulercbs.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/rtems/object.h>
 
 int _Scheduler_CBS_Attach_thread (
diff --git a/cpukit/score/src/schedulercbsdetachthread.c b/cpukit/score/src/schedulercbsdetachthread.c
index 8be62f783d..f4ce6029cc 100644
--- a/cpukit/score/src/schedulercbsdetachthread.c
+++ b/cpukit/score/src/schedulercbsdetachthread.c
@@ -23,6 +23,7 @@
 #include <rtems/config.h>
 #include <rtems/score/scheduler.h>
 #include <rtems/score/schedulercbs.h>
+#include <rtems/score/threaddispatch.h>
 
 int _Scheduler_CBS_Detach_thread (
   Scheduler_CBS_Server_id server_id,
diff --git a/cpukit/score/src/schedulercbsgetexecutiontime.c b/cpukit/score/src/schedulercbsgetexecutiontime.c
index c2c0a3ef23..005cd325ad 100644
--- a/cpukit/score/src/schedulercbsgetexecutiontime.c
+++ b/cpukit/score/src/schedulercbsgetexecutiontime.c
@@ -23,6 +23,7 @@
 #include <rtems/config.h>
 #include <rtems/score/scheduler.h>
 #include <rtems/score/schedulercbs.h>
+#include <rtems/score/threaddispatch.h>
 
 int _Scheduler_CBS_Get_execution_time (
   Scheduler_CBS_Server_id   server_id,
diff --git a/cpukit/score/src/schedulercbsgetremainingbudget.c b/cpukit/score/src/schedulercbsgetremainingbudget.c
index 2d79995a46..892c371d0f 100644
--- a/cpukit/score/src/schedulercbsgetremainingbudget.c
+++ b/cpukit/score/src/schedulercbsgetremainingbudget.c
@@ -22,6 +22,7 @@
 #include <rtems/config.h>
 #include <rtems/score/scheduler.h>
 #include <rtems/score/schedulercbs.h>
+#include <rtems/score/threaddispatch.h>
 
 int _Scheduler_CBS_Get_remaining_budget (
   Scheduler_CBS_Server_id  server_id,
diff --git a/cpukit/score/src/smp.c b/cpukit/score/src/smp.c
index 6f1bc55cc8..d8ceba45ea 100644
--- a/cpukit/score/src/smp.c
+++ b/cpukit/score/src/smp.c
@@ -22,6 +22,7 @@
 #include <rtems/bspsmp.h>
 #include <rtems/score/smp.h>
 #include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 
 #if defined(RTEMS_DEBUG)
   #include <rtems/bspIo.h>
diff --git a/cpukit/score/src/threadclose.c b/cpukit/score/src/threadclose.c
index 05abcefa61..73fff78b73 100644
--- a/cpukit/score/src/threadclose.c
+++ b/cpukit/score/src/threadclose.c
@@ -29,6 +29,7 @@
 #include <rtems/score/states.h>
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/userextimpl.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threaddelayended.c b/cpukit/score/src/threaddelayended.c
index a050669fa5..2750fb7788 100644
--- a/cpukit/score/src/threaddelayended.c
+++ b/cpukit/score/src/threaddelayended.c
@@ -28,6 +28,7 @@
 #include <rtems/score/states.h>
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/wkspace.h>
 
diff --git a/cpukit/score/src/threaddisabledispatch.c b/cpukit/score/src/threaddisabledispatch.c
index 779547dc3a..d89bc924fd 100644
--- a/cpukit/score/src/threaddisabledispatch.c
+++ b/cpukit/score/src/threaddisabledispatch.c
@@ -22,6 +22,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 
 #if defined ( __THREAD_DO_NOT_INLINE_DISABLE_DISPATCH__ )
 void _Thread_Disable_dispatch( void )
diff --git a/cpukit/score/src/threaddispatch.c b/cpukit/score/src/threaddispatch.c
index 66c7bdcd43..4856f8e67b 100644
--- a/cpukit/score/src/threaddispatch.c
+++ b/cpukit/score/src/threaddispatch.c
@@ -28,6 +28,7 @@
 #include <rtems/score/states.h>
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/userextimpl.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threaddispatchdisablelevel.c b/cpukit/score/src/threaddispatchdisablelevel.c
index b1930909bb..ee1bfebe67 100644
--- a/cpukit/score/src/threaddispatchdisablelevel.c
+++ b/cpukit/score/src/threaddispatchdisablelevel.c
@@ -24,7 +24,7 @@
 #include <rtems/score/priority.h>
 #include <rtems/score/states.h>
 #include <rtems/score/sysstate.h>
-#include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 
 #define NO_OWNER_CPU (-1)
 
diff --git a/cpukit/score/src/threadget.c b/cpukit/score/src/threadget.c
index 4bef8681b2..69551f0b11 100644
--- a/cpukit/score/src/threadget.c
+++ b/cpukit/score/src/threadget.c
@@ -29,6 +29,7 @@
 #include <rtems/score/states.h>
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadq.h>
 
 Thread_Control *_Thread_Get (
diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c
index e4f124c052..f21722a063 100644
--- a/cpukit/score/src/threadhandler.c
+++ b/cpukit/score/src/threadhandler.c
@@ -28,6 +28,7 @@
 #include <rtems/score/states.h>
 #include <rtems/score/sysstate.h>
 #include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/userextimpl.h>
 #include <rtems/score/wkspace.h>
diff --git a/cpukit/score/src/threadqtimeout.c b/cpukit/score/src/threadqtimeout.c
index c1f62cf5a7..4792666cf8 100644
--- a/cpukit/score/src/threadqtimeout.c
+++ b/cpukit/score/src/threadqtimeout.c
@@ -24,6 +24,7 @@
 #include <rtems/score/object.h>
 #include <rtems/score/states.h>
 #include <rtems/score/thread.h>
+#include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadq.h>
 #include <rtems/score/tqdata.h>
 
-- 
cgit v1.2.3