From 97312fcc6da163d76b69bf8ce68fd791cf014c2a Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 5 Apr 2016 14:36:30 +0200 Subject: score: Delete Thread_Wait_information::id This field was only by the monitor in non-multiprocessing configurations. Add new field Thread_Wait_information::remote_id in multiprocessing configurations and use it for the remote procedure call thread queue. Add _Thread_Wait_get_id() to obtain the object identifier for debug and system information tools. Ensure the object layout via static asserts. Add test cases to sptests/spthreadq01. --- cpukit/rtems/include/rtems/rtems/barrier.h | 4 ++-- cpukit/rtems/include/rtems/rtems/message.h | 4 ++-- cpukit/rtems/include/rtems/rtems/sem.h | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'cpukit/rtems/include/rtems/rtems') diff --git a/cpukit/rtems/include/rtems/rtems/barrier.h b/cpukit/rtems/include/rtems/rtems/barrier.h index 8c3b9d3022..2eea90fa41 100644 --- a/cpukit/rtems/include/rtems/rtems/barrier.h +++ b/cpukit/rtems/include/rtems/rtems/barrier.h @@ -55,10 +55,10 @@ extern "C" { typedef struct { /** This is used to manage a barrier as an object. */ Objects_Control Object; - /** This is used to specify the attributes of a barrier. */ - rtems_attribute attribute_set; /** This is used to implement the barrier. */ CORE_barrier_Control Barrier; + /** This is used to specify the attributes of a barrier. */ + rtems_attribute attribute_set; } Barrier_Control; /** diff --git a/cpukit/rtems/include/rtems/rtems/message.h b/cpukit/rtems/include/rtems/rtems/message.h index 0fad595277..8ae9e156a1 100644 --- a/cpukit/rtems/include/rtems/rtems/message.h +++ b/cpukit/rtems/include/rtems/rtems/message.h @@ -53,10 +53,10 @@ extern "C" { typedef struct { /** This field is the inherited object characteristics. */ Objects_Control Object; - /** This field is the attribute set as defined by the API. */ - rtems_attribute attribute_set; /** This field is the instance of the SuperCore Message Queue. */ CORE_message_queue_Control message_queue; + /** This field is the attribute set as defined by the API. */ + rtems_attribute attribute_set; } Message_queue_Control; /** diff --git a/cpukit/rtems/include/rtems/rtems/sem.h b/cpukit/rtems/include/rtems/rtems/sem.h index 6c71a9d433..b3950a2939 100644 --- a/cpukit/rtems/include/rtems/rtems/sem.h +++ b/cpukit/rtems/include/rtems/rtems/sem.h @@ -64,13 +64,6 @@ typedef struct { /** This field is the object management portion of a Semaphore instance. */ Objects_Control Object; - /** - * This is the Classic API attribute provided to the create directive. - * It is translated into behavioral attributes on the SuperCore Semaphore - * or Mutex instance. - */ - rtems_attribute attribute_set; - /** * This contains the memory associated with the SuperCore Semaphore or * Mutex instance that provides the primary functionality of each @@ -97,6 +90,13 @@ typedef struct { MRSP_Control mrsp; #endif } Core_control; + + /** + * This is the Classic API attribute provided to the create directive. + * It is translated into behavioral attributes on the SuperCore Semaphore + * or Mutex instance. + */ + rtems_attribute attribute_set; } Semaphore_Control; /** -- cgit v1.2.3