1 files changed, 9 insertions, 74 deletions

diff --git a/rtemsbsd/rtems/rtems-bsd-muteximpl.c b/rtemsbsd/rtems/rtems-bsd-muteximpl.c
index 2bfa3b1e..c68bd461 100644
--- a/rtemsbsd/rtems/rtems-bsd-muteximpl.c
+++ b/rtemsbsd/rtems/rtems-bsd-muteximpl.c
@@ -41,29 +41,8 @@
 #include <machine/rtems-bsd-muteximpl.h>
 
 #include <rtems/score/schedulerimpl.h>
-#include <rtems/score/threaddispatch.h>
 #include <rtems/score/threadqimpl.h>
 
-#define INTEND_TO_BLOCK \
-    (THREAD_WAIT_CLASS_OBJECT | THREAD_WAIT_STATE_INTEND_TO_BLOCK)
-
-#define BLOCKED \
-    (THREAD_WAIT_CLASS_OBJECT | THREAD_WAIT_STATE_BLOCKED)
-
-#define INTERRUPT_SATISFIED \
-    (THREAD_WAIT_CLASS_OBJECT | THREAD_WAIT_STATE_INTERRUPT_SATISFIED)
-
-static void
-rtems_bsd_mutex_priority_change(Thread_Control *thread,
-    Priority_Control new_priority, void *context)
-{
-	rtems_bsd_mutex *m = context;
-
-	_RBTree_Extract(&m->rivals, &thread->RBNode);
-	_RBTree_Insert(&m->rivals, &thread->RBNode,
-	    _Thread_queue_Compare_priority, false);
-}
-
 void
 rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m,
     Thread_Control *owner, Thread_Control *executing,
@@ -73,38 +52,14 @@ rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m,
 		BSD_ASSERT(lock->lo_flags & LO_RECURSABLE);
 		++m->nest_level;
 
-		_ISR_lock_Release_and_ISR_enable(&m->lock, lock_context);
+		_Thread_queue_Release(&m->queue, lock_context);
 	} else {
-		Per_CPU_Control *cpu_self;
-		bool success;
-
-		_Thread_Lock_set(executing, &m->lock);
-		_Thread_Priority_set_change_handler(executing,
-		    rtems_bsd_mutex_priority_change, m);
-		++executing->resource_count;
-		_RBTree_Insert(&m->rivals, &executing->RBNode,
-		    _Thread_queue_Compare_priority, false);
-
-		cpu_self = _Thread_Dispatch_disable_critical();
-
 		/* Priority inheritance */
-		_Scheduler_Change_priority_if_higher(_Scheduler_Get(owner),
-		    owner, executing->current_priority, false);
-
-		_Thread_Wait_flags_set(executing, INTEND_TO_BLOCK);
-
-		_ISR_lock_Release_and_ISR_enable(&m->lock, lock_context);
-
-		_Thread_Set_state(executing, STATES_WAITING_FOR_MUTEX);
-
-		success = _Thread_Wait_flags_try_change(executing,
-		    INTEND_TO_BLOCK, BLOCKED);
-		if (!success) {
-			_Thread_Clear_state(executing,
-			    STATES_WAITING_FOR_MUTEX);
-		}
+		_Thread_Raise_priority(owner, executing->current_priority);
 
-		_Thread_Dispatch_enable(cpu_self);
+		_Thread_queue_Enqueue_critical(&m->queue, executing,
+		    STATES_WAITING_FOR_MUTEX, WATCHDOG_NO_TIMEOUT, 0,
+		    lock_context);
 	}
 }
 
@@ -114,40 +69,20 @@ rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner,
 {
 	if (first != NULL) {
 		Thread_Control *new_owner;
-		bool success;
 
 		new_owner = THREAD_RBTREE_NODE_TO_THREAD(first);
 		m->owner = new_owner;
-		_RBTree_Extract(&m->rivals, &new_owner->RBNode);
-		_Thread_Priority_restore_default_change_handler(new_owner);
-		_Thread_Lock_restore_default(new_owner);
-
-		success = _Thread_Wait_flags_try_change_critical(new_owner,
-		    INTEND_TO_BLOCK, INTERRUPT_SATISFIED);
-		if (success) {
-			_ISR_lock_Release_and_ISR_enable(&m->lock,
-			    lock_context);
-		} else {
-			Per_CPU_Control *cpu_self;
-
-			cpu_self = _Thread_Dispatch_disable_critical();
-			_ISR_lock_Release_and_ISR_enable(&m->lock,
-			    lock_context);
-
-			_Thread_Clear_state(new_owner,
-			    STATES_WAITING_FOR_MUTEX);
-
-			_Thread_Dispatch_enable(cpu_self);
-		}
+		_Thread_queue_Extract_critical(&m->queue, new_owner,
+		    lock_context);
 	} else {
-		_ISR_lock_Release_and_ISR_enable(&m->lock, lock_context);
+		_Thread_queue_Release(&m->queue, lock_context);
 	}
 
 	if (!keep_priority) {
 		Per_CPU_Control *cpu_self;
 
 		cpu_self = _Thread_Dispatch_disable();
-		_Thread_Change_priority(owner, owner->real_priority, true);
+		_Thread_Restore_priority(owner);
 		_Thread_Dispatch_enable(cpu_self);
 	}
 }