diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-30 16:05:15 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-30 16:06:42 +0200 |
| commit | 70d52b8d19deb4f8d080caa0fe2cbc13dca309cc (patch) | |
| tree | e59b972d751c9f47ea3132cd5d238bfea9227a85 | |
| parent | Adjust <sys/stdint.h> for latest Newlib (diff) | |
| download | rtems-libbsd-70d52b8d19deb4f8d080caa0fe2cbc13dca309cc.tar.bz2 | |
rtems-bsd-mutex: Update due to API changes
| -rw-r--r-- | rtemsbsd/include/machine/rtems-bsd-muteximpl.h | 6 | ||||
| -rw-r--r-- | rtemsbsd/rtems/rtems-kernel-muteximpl.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/rtemsbsd/include/machine/rtems-bsd-muteximpl.h b/rtemsbsd/include/machine/rtems-bsd-muteximpl.h index b041bc9e..856e5f4d 100644 --- a/rtemsbsd/include/machine/rtems-bsd-muteximpl.h +++ b/rtemsbsd/include/machine/rtems-bsd-muteximpl.h @@ -75,7 +75,7 @@ rtems_bsd_mutex_lock(struct lock_object *lock, rtems_bsd_mutex *m) Thread_Control *executing; Thread_Control *owner; - _Thread_queue_Context_initialize(&queue_context, NULL); + _Thread_queue_Context_initialize(&queue_context); _Thread_queue_Acquire(&m->queue, &queue_context.Lock_context); owner = m->owner; @@ -100,7 +100,7 @@ rtems_bsd_mutex_trylock(struct lock_object *lock, rtems_bsd_mutex *m) Thread_Control *executing; Thread_Control *owner; - _Thread_queue_Context_initialize(&queue_context, NULL); + _Thread_queue_Context_initialize(&queue_context); _Thread_queue_Acquire(&m->queue, &queue_context.Lock_context); owner = m->owner; @@ -134,7 +134,7 @@ rtems_bsd_mutex_unlock(rtems_bsd_mutex *m) Thread_Control *owner; int nest_level; - _Thread_queue_Context_initialize(&queue_context, NULL); + _Thread_queue_Context_initialize(&queue_context); _Thread_queue_Acquire(&m->queue, &queue_context.Lock_context); nest_level = m->nest_level; diff --git a/rtemsbsd/rtems/rtems-kernel-muteximpl.c b/rtemsbsd/rtems/rtems-kernel-muteximpl.c index 455b089f..2b7cb686 100644 --- a/rtemsbsd/rtems/rtems-kernel-muteximpl.c +++ b/rtemsbsd/rtems/rtems-kernel-muteximpl.c @@ -60,10 +60,11 @@ rtems_bsd_mutex_lock_more(struct lock_object *lock, rtems_bsd_mutex *m, _Thread_Raise_priority(owner, executing->current_priority); ++executing->resource_count; + _Thread_queue_Context_set_expected_level(queue_context, 1); _Thread_queue_Enqueue_critical(&m->queue, BSD_MUTEX_TQ_OPERATIONS, executing, - STATES_WAITING_FOR_MUTEX, WATCHDOG_NO_TIMEOUT, 0, - &queue_context->Lock_context); + STATES_WAITING_FOR_MUTEX, WATCHDOG_NO_TIMEOUT, + queue_context); } } |