Merge branch 'component_bt/osi_fixed_queue_v3.1' into 'release/v3.1'
component_bt/: Fix pointer type in fixed_queue v3.1 See merge request espressif/esp-idf!6849
This commit is contained in:
commit
612a25f50c
1 changed files with 3 additions and 3 deletions
|
@ -189,7 +189,7 @@ void *fixed_queue_try_dequeue(fixed_queue_t *queue)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (osi_sem_take(queue->dequeue_sem, 0) != 0) {
|
if (osi_sem_take(&queue->dequeue_sem, 0) != 0) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -243,14 +243,14 @@ void *fixed_queue_try_remove_from_queue(fixed_queue_t *queue, void *data)
|
||||||
|
|
||||||
osi_mutex_lock(&queue->lock, OSI_MUTEX_MAX_TIMEOUT);
|
osi_mutex_lock(&queue->lock, OSI_MUTEX_MAX_TIMEOUT);
|
||||||
if (list_contains(queue->list, data) &&
|
if (list_contains(queue->list, data) &&
|
||||||
osi_sem_take(queue->dequeue_sem, 0) == 0) {
|
osi_sem_take(&queue->dequeue_sem, 0) == 0) {
|
||||||
removed = list_remove(queue->list, data);
|
removed = list_remove(queue->list, data);
|
||||||
assert(removed);
|
assert(removed);
|
||||||
}
|
}
|
||||||
osi_mutex_unlock(&queue->lock);
|
osi_mutex_unlock(&queue->lock);
|
||||||
|
|
||||||
if (removed) {
|
if (removed) {
|
||||||
osi_sem_give(queue->enqueue_sem);
|
osi_sem_give(&queue->enqueue_sem);
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue