diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-25 13:09:58 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-25 13:09:58 +0200 |
| commit | 9546d905c263d7a0ed25266e7dc00da740105b29 (patch) | |
| tree | 13e5b97a6dfe7f6c83eb12e849d0798d5aa8abeb /rtemsbsd/rtems/rtems-kernel-muteximpl.c | |
| parent | rc.conf: Add the net directives by default. (diff) | |
| download | rtems-libbsd-9546d905c263d7a0ed25266e7dc00da740105b29.tar.bz2 | |
rtems-bsd-mutex: Update due to API changes
Diffstat (limited to 'rtemsbsd/rtems/rtems-kernel-muteximpl.c')
| -rw-r--r-- | rtemsbsd/rtems/rtems-kernel-muteximpl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rtemsbsd/rtems/rtems-kernel-muteximpl.c b/rtemsbsd/rtems/rtems-kernel-muteximpl.c index ff54365e..455b089f 100644 --- a/rtemsbsd/rtems/rtems-kernel-muteximpl.c +++ b/rtemsbsd/rtems/rtems-kernel-muteximpl.c @@ -48,13 +48,13 @@ void rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m, Thread_Control *owner, Thread_Control *executing, - ISR_lock_Context *lock_context) + Thread_queue_Context *queue_context) { if (owner == executing) { BSD_ASSERT(lock->lo_flags & LO_RECURSABLE); ++m->nest_level; - _Thread_queue_Release(&m->queue, lock_context); + _Thread_queue_Release(&m->queue, &queue_context->Lock_context); } else { /* Priority inheritance */ _Thread_Raise_priority(owner, executing->current_priority); @@ -63,14 +63,14 @@ rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m, _Thread_queue_Enqueue_critical(&m->queue, BSD_MUTEX_TQ_OPERATIONS, executing, STATES_WAITING_FOR_MUTEX, WATCHDOG_NO_TIMEOUT, 0, - lock_context); + &queue_context->Lock_context); } } void rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner, int keep_priority, Thread_queue_Heads *heads, - ISR_lock_Context *lock_context) + Thread_queue_Context *queue_context) { if (heads != NULL) { const Thread_queue_Operations *operations; @@ -80,9 +80,9 @@ rtems_bsd_mutex_unlock_more(rtems_bsd_mutex *m, Thread_Control *owner, new_owner = ( *operations->first )( heads ); m->owner = new_owner; _Thread_queue_Extract_critical(&m->queue, operations, - new_owner, NULL, 0, lock_context); + new_owner, queue_context); } else { - _Thread_queue_Release(&m->queue, lock_context); + _Thread_queue_Release(&m->queue, &queue_context->Lock_context); } if (!keep_priority) { |