Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

queue: make data pointers const in queue_try_add and queue_add_blocking #423

Merged
merged 1 commit into from
May 24, 2021
Merged

queue: make data pointers const in queue_try_add and queue_add_blocking #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/common/pico_util/include/pico/util/queue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static inline bool queue_is_full(queue_t *q) {
* If the queue is full this function will return immediately with false, otherwise
* the data is copied into a new value added to the queue, and this function will return true.
*/
bool queue_try_add(queue_t *q, void *data);
bool queue_try_add(queue_t *q, const void *data);

/*! \brief Non-blocking removal of entry from the queue if non empty
* \ingroup queue
Expand Down Expand Up @@ -165,7 +165,7 @@ bool queue_try_peek(queue_t *q, void *data);
*
* If the queue is full this function will block, until a removal happens on the queue
*/
void queue_add_blocking(queue_t *q, void *data);
void queue_add_blocking(queue_t *q, const void *data);

/*! \brief Blocking remove entry from queue
* \ingroup queue
Expand Down
6 changes: 3 additions & 3 deletions src/common/pico_util/queue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static inline uint16_t inc_index(queue_t *q, uint16_t index) {
return index;
}

static bool queue_add_internal(queue_t *q, void *data, bool block) {
static bool queue_add_internal(queue_t *q, const void *data, bool block) {
do {
uint32_t save = spin_lock_blocking(q->core.spin_lock);
if (queue_get_level_unsafe(q) != q->element_count) {
Expand Down Expand Up @@ -86,7 +86,7 @@ static bool queue_peek_internal(queue_t *q, void *data, bool block) {
} while (true);
}

bool queue_try_add(queue_t *q, void *data) {
bool queue_try_add(queue_t *q, const void *data) {
return queue_add_internal(q, data, false);
}

Expand All @@ -98,7 +98,7 @@ bool queue_try_peek(queue_t *q, void *data) {
return queue_peek_internal(q, data, false);
}

void queue_add_blocking(queue_t *q, void *data) {
void queue_add_blocking(queue_t *q, const void *data) {
queue_add_internal(q, data, true);
}

Expand Down