diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-23 06:26:58 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-25 12:43:53 +0200 |
commit | 8866e6222f5cbfa285b6411fb74154289b024c6b (patch) | |
tree | efb749aece2eb57246e1285f419dff9ebb44c0d9 /cpukit/posix/src | |
parent | mpci: Fix thread queue flush method (diff) | |
download | rtems-8866e6222f5cbfa285b6411fb74154289b024c6b.tar.bz2 |
score: Move thread queue object support
Diffstat (limited to 'cpukit/posix/src')
-rw-r--r-- | cpukit/posix/src/condwaitsupp.c | 7 | ||||
-rw-r--r-- | cpukit/posix/src/mqueuerecvsupp.c | 3 | ||||
-rw-r--r-- | cpukit/posix/src/mutexlocksupp.c | 2 | ||||
-rw-r--r-- | cpukit/posix/src/pbarrierwait.c | 3 | ||||
-rw-r--r-- | cpukit/posix/src/prwlockwrlock.c | 3 | ||||
-rw-r--r-- | cpukit/posix/src/semaphorewaitsupp.c | 6 |
6 files changed, 7 insertions, 17 deletions
diff --git a/cpukit/posix/src/condwaitsupp.c b/cpukit/posix/src/condwaitsupp.c index b578a5f76f..4f0ac3cab8 100644 --- a/cpukit/posix/src/condwaitsupp.c +++ b/cpukit/posix/src/condwaitsupp.c @@ -22,12 +22,9 @@ #include <rtems/posix/muteximpl.h> #include <rtems/score/assert.h> #include <rtems/score/statesimpl.h> -#include <rtems/score/threadimpl.h> +#include <rtems/score/threaddispatch.h> -THREAD_WAIT_QUEUE_OBJECT_ASSERT( - POSIX_Condition_variables_Control, - Wait_queue -); +THREAD_QUEUE_OBJECT_ASSERT( POSIX_Condition_variables_Control, Wait_queue ); int _POSIX_Condition_variables_Wait_support( pthread_cond_t *cond, diff --git a/cpukit/posix/src/mqueuerecvsupp.c b/cpukit/posix/src/mqueuerecvsupp.c index 1d7d527d49..b5a790a2bd 100644 --- a/cpukit/posix/src/mqueuerecvsupp.c +++ b/cpukit/posix/src/mqueuerecvsupp.c @@ -19,11 +19,10 @@ #endif #include <rtems/posix/mqueueimpl.h> -#include <rtems/score/threadimpl.h> #include <fcntl.h> -THREAD_WAIT_QUEUE_OBJECT_ASSERT( +THREAD_QUEUE_OBJECT_ASSERT( POSIX_Message_queue_Control, Message_queue.Wait_queue ); diff --git a/cpukit/posix/src/mutexlocksupp.c b/cpukit/posix/src/mutexlocksupp.c index 5c708579f6..0c70cf06e2 100644 --- a/cpukit/posix/src/mutexlocksupp.c +++ b/cpukit/posix/src/mutexlocksupp.c @@ -20,7 +20,7 @@ #include <rtems/posix/muteximpl.h> -THREAD_WAIT_QUEUE_OBJECT_ASSERT( POSIX_Mutex_Control, Mutex.Wait_queue ); +THREAD_QUEUE_OBJECT_ASSERT( POSIX_Mutex_Control, Mutex.Wait_queue ); int _POSIX_Mutex_Lock_support( pthread_mutex_t *mutex, diff --git a/cpukit/posix/src/pbarrierwait.c b/cpukit/posix/src/pbarrierwait.c index 9200dc0eee..150ece7fff 100644 --- a/cpukit/posix/src/pbarrierwait.c +++ b/cpukit/posix/src/pbarrierwait.c @@ -19,9 +19,8 @@ #endif #include <rtems/posix/barrierimpl.h> -#include <rtems/score/threadimpl.h> -THREAD_WAIT_QUEUE_OBJECT_ASSERT( POSIX_Barrier_Control, Barrier.Wait_queue ); +THREAD_QUEUE_OBJECT_ASSERT( POSIX_Barrier_Control, Barrier.Wait_queue ); /** * This directive allows a thread to wait at a barrier. diff --git a/cpukit/posix/src/prwlockwrlock.c b/cpukit/posix/src/prwlockwrlock.c index 635f376e7d..568316363a 100644 --- a/cpukit/posix/src/prwlockwrlock.c +++ b/cpukit/posix/src/prwlockwrlock.c @@ -24,9 +24,8 @@ #include <errno.h> #include <rtems/posix/rwlockimpl.h> -#include <rtems/score/threadimpl.h> -THREAD_WAIT_QUEUE_OBJECT_ASSERT( POSIX_RWLock_Control, RWLock.Wait_queue ); +THREAD_QUEUE_OBJECT_ASSERT( POSIX_RWLock_Control, RWLock.Wait_queue ); int pthread_rwlock_wrlock( pthread_rwlock_t *rwlock diff --git a/cpukit/posix/src/semaphorewaitsupp.c b/cpukit/posix/src/semaphorewaitsupp.c index 02a2ae19e5..f08efa8e22 100644 --- a/cpukit/posix/src/semaphorewaitsupp.c +++ b/cpukit/posix/src/semaphorewaitsupp.c @@ -21,12 +21,8 @@ #include <semaphore.h> #include <rtems/posix/semaphoreimpl.h> -#include <rtems/score/threadimpl.h> -THREAD_WAIT_QUEUE_OBJECT_ASSERT( - POSIX_Semaphore_Control, - Semaphore.Wait_queue -); +THREAD_QUEUE_OBJECT_ASSERT( POSIX_Semaphore_Control, Semaphore.Wait_queue ); int _POSIX_Semaphore_Wait_support( sem_t *sem, |