From 5a598ac99b0de720a04afc5e2ac6764117589b90 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 27 May 2016 08:02:03 +0200 Subject: score: Add CORE mutex variants Add CORE_recursive_mutex_Control and CORE_ceiling_mutex_Control to avoid the run-time evaluation of attributes to figure out how a particular mutex methods should behave. Start with the no protocol variants. This eliminates the CORE_MUTEX_DISCIPLINES_FIFO and CORE_MUTEX_DISCIPLINES_PRIORITY disciplines. --- cpukit/libmisc/monitor/mon-sema.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cpukit/libmisc') diff --git a/cpukit/libmisc/monitor/mon-sema.c b/cpukit/libmisc/monitor/mon-sema.c index 5add7cf06f..bc745294e7 100644 --- a/cpukit/libmisc/monitor/mon-sema.c +++ b/cpukit/libmisc/monitor/mon-sema.c @@ -22,7 +22,7 @@ rtems_monitor_sema_canonical( canonical_sema->attribute = rtems_sema->attribute_set; canonical_sema->priority_ceiling = - rtems_sema->Core_control.mutex.Attributes.priority_ceiling; + rtems_sema->Core_control.Mutex.priority_ceiling; canonical_sema->holder_id = 0; @@ -33,8 +33,9 @@ rtems_monitor_sema_canonical( } else { /* we have a binary semaphore (mutex) */ - Thread_Control *holder = rtems_sema->Core_control.mutex.holder; + Thread_Control *holder; + holder = rtems_sema->Core_control.Mutex.Recursive.Mutex.holder; if (holder != NULL) { canonical_sema->holder_id = holder->Object.id; canonical_sema->cur_count = 0; -- cgit v1.2.3