diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-11-23 14:13:48 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-11-24 09:49:04 +0100 |
| commit | 87e3b462967291a70410e312620b3ea320d33f6c (patch) | |
| tree | 081f03019b015af4ed74b9c729fe2dec8b0b848e | |
| parent | Use -Wno-pointer-sign (diff) | |
| download | rtems-libbsd-87e3b462967291a70410e312620b3ea320d33f6c.tar.bz2 | |
rtems-bsd-mutex: Update due to API changes
| -rw-r--r-- | rtemsbsd/rtems/rtems-kernel-muteximpl.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/rtemsbsd/rtems/rtems-kernel-muteximpl.c b/rtemsbsd/rtems/rtems-kernel-muteximpl.c index 3ce68a61..3cec1dc6 100644 --- a/rtemsbsd/rtems/rtems-kernel-muteximpl.c +++ b/rtemsbsd/rtems/rtems-kernel-muteximpl.c @@ -51,14 +51,16 @@ rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m, BSD_ASSERT(lock->lo_flags & LO_RECURSABLE); ++m->nest_level; - _Thread_queue_Release(&m->queue, &queue_context->Lock_context); + _Thread_queue_Release(&m->queue, queue_context); } else { - _Thread_queue_Context_set_expected_level(queue_context, 1); + _Thread_queue_Context_set_thread_state(queue_context, + STATES_WAITING_FOR_SYS_LOCK_MUTEX); _Thread_queue_Context_set_no_timeout(queue_context); + _Thread_queue_Context_set_do_nothing_enqueue_callout( + queue_context); _Thread_queue_Context_set_deadlock_callout(queue_context, _Thread_queue_Deadlock_fatal); - _Thread_queue_Enqueue_critical(&m->queue.Queue, - RTEMS_BSD_MUTEX_TQ_OPERATIONS, executing, - STATES_WAITING_FOR_SYS_LOCK_MUTEX, queue_context); + _Thread_queue_Enqueue(&m->queue.Queue, + RTEMS_BSD_MUTEX_TQ_OPERATIONS, executing, queue_context); } } |