summaryrefslogtreecommitdiffstats
path: root/cpukit/score/src
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2017-01-12 10:15:56 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2017-01-13 07:19:21 +0100
commit2b72162b81b33a9f5983feccadd8426a1ab6f950 (patch)
tree8062fa245235d389599ef503e5b25ec3494ace8c /cpukit/score/src
parentscore: Add and use _Objects_Name_to_string() (diff)
downloadrtems-2b72162b81b33a9f5983feccadd8426a1ab6f950.tar.bz2
score: Add Thread_queue_Queue::name
Update #2858.
Diffstat (limited to 'cpukit/score/src')
-rw-r--r--cpukit/score/src/condition.c2
-rw-r--r--cpukit/score/src/futex.c2
-rw-r--r--cpukit/score/src/mutex.c8
-rw-r--r--cpukit/score/src/semaphore.c4
-rw-r--r--cpukit/score/src/threadq.c8
5 files changed, 15 insertions, 9 deletions
diff --git a/cpukit/score/src/condition.c b/cpukit/score/src/condition.c
index 3c3a01141c..7c370acba3 100644
--- a/cpukit/score/src/condition.c
+++ b/cpukit/score/src/condition.c
@@ -41,7 +41,7 @@ RTEMS_STATIC_ASSERT(
);
RTEMS_STATIC_ASSERT(
- sizeof( Condition_Control ) <= sizeof( struct _Condition_Control ),
+ sizeof( Condition_Control ) == sizeof( struct _Condition_Control ),
CONDITION_CONTROL_SIZE
);
diff --git a/cpukit/score/src/futex.c b/cpukit/score/src/futex.c
index d09b00b1c9..1a19f32ca7 100644
--- a/cpukit/score/src/futex.c
+++ b/cpukit/score/src/futex.c
@@ -39,7 +39,7 @@ RTEMS_STATIC_ASSERT(
);
RTEMS_STATIC_ASSERT(
- sizeof( Futex_Control ) <= sizeof( struct _Futex_Control ),
+ sizeof( Futex_Control ) == sizeof( struct _Futex_Control ),
FUTEX_CONTROL_SIZE
);
diff --git a/cpukit/score/src/mutex.c b/cpukit/score/src/mutex.c
index ebdedf773d..96834bfb36 100644
--- a/cpukit/score/src/mutex.c
+++ b/cpukit/score/src/mutex.c
@@ -39,7 +39,7 @@ RTEMS_STATIC_ASSERT(
);
RTEMS_STATIC_ASSERT(
- sizeof( Mutex_Control ) <= sizeof( struct _Mutex_Control ),
+ sizeof( Mutex_Control ) == sizeof( struct _Mutex_Control ),
MUTEX_CONTROL_SIZE
);
@@ -50,19 +50,19 @@ typedef struct {
RTEMS_STATIC_ASSERT(
offsetof( Mutex_recursive_Control, Mutex )
- <= offsetof( struct _Mutex_recursive_Control, _Mutex ),
+ == offsetof( struct _Mutex_recursive_Control, _Mutex ),
MUTEX_RECURSIVE_CONTROL_MUTEX
);
RTEMS_STATIC_ASSERT(
offsetof( Mutex_recursive_Control, nest_level )
- <= offsetof( struct _Mutex_recursive_Control, _nest_level ),
+ == offsetof( struct _Mutex_recursive_Control, _nest_level ),
MUTEX_RECURSIVE_CONTROL_NEST_LEVEL
);
RTEMS_STATIC_ASSERT(
sizeof( Mutex_recursive_Control )
- <= sizeof( struct _Mutex_recursive_Control ),
+ == sizeof( struct _Mutex_recursive_Control ),
MUTEX_RECURSIVE_CONTROL_SIZE
);
diff --git a/cpukit/score/src/semaphore.c b/cpukit/score/src/semaphore.c
index 5e64583803..78fec377fe 100644
--- a/cpukit/score/src/semaphore.c
+++ b/cpukit/score/src/semaphore.c
@@ -39,12 +39,12 @@ RTEMS_STATIC_ASSERT(
RTEMS_STATIC_ASSERT(
offsetof( Semaphore_Control, count )
- <= offsetof( struct _Semaphore_Control, _count ),
+ == offsetof( struct _Semaphore_Control, _count ),
SEMAPHORE_CONTROL_COUNT
);
RTEMS_STATIC_ASSERT(
- sizeof( Semaphore_Control ) <= sizeof( struct _Semaphore_Control ),
+ sizeof( Semaphore_Control ) == sizeof( struct _Semaphore_Control ),
SEMAPHORE_CONTROL_SIZE
);
diff --git a/cpukit/score/src/threadq.c b/cpukit/score/src/threadq.c
index b12e3deb49..4885326e52 100644
--- a/cpukit/score/src/threadq.c
+++ b/cpukit/score/src/threadq.c
@@ -57,8 +57,14 @@ RTEMS_STATIC_ASSERT(
);
RTEMS_STATIC_ASSERT(
+ offsetof( Thread_queue_Syslock_queue, Queue.name )
+ == offsetof( struct _Thread_queue_Queue, _name ),
+ THREAD_QUEUE_SYSLOCK_QUEUE_NAME
+);
+
+RTEMS_STATIC_ASSERT(
sizeof( Thread_queue_Syslock_queue )
- <= sizeof( struct _Thread_queue_Queue ),
+ == sizeof( struct _Thread_queue_Queue ),
THREAD_QUEUE_SYSLOCK_QUEUE_SIZE
);