mirror/pico-sdk
1
0
Fork 0
mirror of https://github.com/raspberrypi/pico-sdk.git synced 2025-12-10 07:14:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

#1670 removing element count from static queue

Browse source
This commit is contained in:
David Thacher 2024-03-18 08:58:57 -04:00
parent cd4f0bb7ca
commit 9f1958bf3f
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/pico_util/include/pico/util/queue.h
View file

@ -67,24 +67,22 @@ static inline void queue_init(queue_t *q, uint element_size, uint element_count)
*
* \param q Pointer to a queue_t structure, used as a handle
* \param element_size Size of each value in the queue
* \param element_count Maximum number of entries in the queue
* \param spinlock_num The spin ID used to protect the queue
* \param storage Pointer to queue storage array
* \param storage_size Size of the queue storage array
* \param storage_size Size of the queue storage array. (Must be N + 1 elements.)
*/
void static_queue_init_with_spinlock(queue_t *q, uint element_size, uint element_count, uint spinlock_num, uint8_t *storage, uint32_t storage_size);
void static_queue_init_with_spinlock(queue_t *q, uint element_size, uint spinlock_num, uint8_t *storage, uint32_t storage_size);
/*! \brief Initialise a static queue, allocating a (possibly shared) spinlock
* \ingroup queue
*
* \param q Pointer to a queue_t structure, used as a handle
* \param element_size Size of each value in the queue
* \param element_count Maximum number of entries in the queue
* \param storage Pointer to queue storage array
* \param storage_size Size of the queue storage array
* \param storage_size Size of the queue storage array. (Must be N + 1 elements.)
*/
static inline void static_queue_init(queue_t *q, uint element_size, uint element_count, uint8_t *storage, uint32_t storage_size) {
static_queue_init_with_spinlock(q, element_size, element_count, next_striped_spin_lock_num(), storage, storage_size);
static inline void static_queue_init(queue_t *q, uint element_size, uint8_t *storage, uint32_t storage_size) {
static_queue_init_with_spinlock(q, element_size, next_striped_spin_lock_num(), storage, storage_size);
}
/*! \brief Destroy the specified queue.

6
src/common/pico_util/queue.c
View file

@ -18,12 +18,12 @@ void queue_init_with_spinlock(queue_t *q, uint element_size, uint element_count,
q->rptr = 0;
}
void static_queue_init_with_spinlock(queue_t *q, uint element_size, uint element_count, uint spinlock_num, uint8_t *storage, uint32_t storage_size) {
void static_queue_init_with_spinlock(queue_t *q, uint element_size, uint spinlock_num, uint8_t *storage, uint32_t storage_size) {
assert(q != NULL);
assert(storage_size >= ((element_count + 1) * element_size));
assert((storage_size / element_size) >= 2);
lock_init(&q->core, spinlock_num);
q->data = storage;
q->element_count = (uint16_t)element_count;
q->element_count = (uint16_t) ((storage_size / element_size) - 1);
q->element_size = (uint16_t)element_size;
q->wptr = 0;
q->rptr = 0;