summaryrefslogtreecommitdiff
path: root/cpukit/rtems
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-23 06:26:58 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-05-25 12:43:53 +0200
commit8866e6222f5cbfa285b6411fb74154289b024c6b (patch)
treeefb749aece2eb57246e1285f419dff9ebb44c0d9 /cpukit/rtems
parent0e9d5b69cccac14f02f8370e1f75d3ac714a4350 (diff)
score: Move thread queue object support
Diffstat (limited to 'cpukit/rtems')
-rw-r--r--cpukit/rtems/src/barrierwait.c3
-rw-r--r--cpukit/rtems/src/msgqreceive.c6
-rw-r--r--cpukit/rtems/src/semobtain.c5
3 files changed, 4 insertions, 10 deletions
diff --git a/cpukit/rtems/src/barrierwait.c b/cpukit/rtems/src/barrierwait.c
index b5f23d7bb5..d9d386956e 100644
--- a/cpukit/rtems/src/barrierwait.c
+++ b/cpukit/rtems/src/barrierwait.c
@@ -19,9 +19,8 @@
#endif
#include <rtems/rtems/barrierimpl.h>
-#include <rtems/score/threadimpl.h>
-THREAD_WAIT_QUEUE_OBJECT_ASSERT( Barrier_Control, Barrier.Wait_queue );
+THREAD_QUEUE_OBJECT_ASSERT( Barrier_Control, Barrier.Wait_queue );
rtems_status_code rtems_barrier_wait(
rtems_id id,
diff --git a/cpukit/rtems/src/msgqreceive.c b/cpukit/rtems/src/msgqreceive.c
index 578b280fd2..dada8dff81 100644
--- a/cpukit/rtems/src/msgqreceive.c
+++ b/cpukit/rtems/src/msgqreceive.c
@@ -19,13 +19,9 @@
#endif
#include <rtems/rtems/messageimpl.h>
-#include <rtems/score/threadimpl.h>
#include <rtems/rtems/optionsimpl.h>
-THREAD_WAIT_QUEUE_OBJECT_ASSERT(
- Message_queue_Control,
- message_queue.Wait_queue
-);
+THREAD_QUEUE_OBJECT_ASSERT( Message_queue_Control, message_queue.Wait_queue );
rtems_status_code rtems_message_queue_receive(
rtems_id id,
diff --git a/cpukit/rtems/src/semobtain.c b/cpukit/rtems/src/semobtain.c
index 43408156d4..3cf780aa28 100644
--- a/cpukit/rtems/src/semobtain.c
+++ b/cpukit/rtems/src/semobtain.c
@@ -19,16 +19,15 @@
#endif
#include <rtems/rtems/semimpl.h>
-#include <rtems/score/threadimpl.h>
#include <rtems/rtems/attrimpl.h>
#include <rtems/rtems/optionsimpl.h>
-THREAD_WAIT_QUEUE_OBJECT_ASSERT(
+THREAD_QUEUE_OBJECT_ASSERT(
Semaphore_Control,
Core_control.mutex.Wait_queue
);
-THREAD_WAIT_QUEUE_OBJECT_ASSERT(
+THREAD_QUEUE_OBJECT_ASSERT(
Semaphore_Control,
Core_control.semaphore.Wait_queue
);