michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: usb_dc_nrfx: Use mem_slab for fifo elements

Browse source 
mem_slab can be used instead of heap, because all allocated
elements have the same size.

Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
This commit is contained in:
Marek Pieta 2020-12-23 13:34:47 +01:00 • committed by Carles Cufí
commit f5a38cb5be
1 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

27
drivers/usb/device/usb_dc_nrfx.c
View file

@ -168,22 +168,17 @@ struct usbd_event {
};
/**
* @brief Fifo element pool
* @brief Fifo element slab
* Used for allocating fifo elements to pass from ISR to work handler
* TODO: The number of FIFO elements is an arbitrary number now but it should
* be derived from the theoretical number of backlog events possible depending
* on the number of endpoints configured.
*/
#define FIFO_ELEM_MIN_SZ sizeof(struct usbd_event)
#define FIFO_ELEM_MAX_SZ sizeof(struct usbd_event)
#define FIFO_ELEM_SZ sizeof(struct usbd_event)
#define FIFO_ELEM_ALIGN sizeof(unsigned int)
#if CONFIG_USB_NRFX_EVT_QUEUE_SIZE < 4
#error Invalid USBD event queue size (CONFIG_USB_NRFX_EVT_QUEUE_SIZE).
#endif
K_HEAP_DEFINE(fifo_elem_pool,
FIFO_ELEM_MAX_SZ * CONFIG_USB_NRFX_EVT_QUEUE_SIZE);
K_MEM_SLAB_DEFINE(fifo_elem_slab, FIFO_ELEM_SZ,
CONFIG_USB_NRFX_EVT_QUEUE_SIZE, FIFO_ELEM_ALIGN);
/** Number of IN Endpoints configured (including control) */
@ -390,7 +385,7 @@ static inline void usbd_work_schedule(void)
*/
static inline void usbd_evt_free(struct usbd_event *ev)
{
k_heap_free(&fifo_elem_pool, &ev->block);
k_mem_slab_free(&fifo_elem_slab, (void **)&ev->block.data);
}
/**
@ -438,11 +433,8 @@ static inline struct usbd_event *usbd_evt_alloc(void)
struct usbd_event *ev;
struct usbd_mem_block block;
block.data = k_heap_alloc(&fifo_elem_pool,
sizeof(struct usbd_event),
K_NO_WAIT);
if (block.data == NULL) {
if (k_mem_slab_alloc(&fifo_elem_slab,
(void **)&block.data, K_NO_WAIT)) {
LOG_ERR("USBD event allocation failed!");
/*
@ -453,10 +445,7 @@ static inline struct usbd_event *usbd_evt_alloc(void)
*/
usbd_evt_flush();
block.data = k_heap_alloc(&fifo_elem_pool,
sizeof(struct usbd_event),
K_NO_WAIT);
if (block.data == NULL) {
if (k_mem_slab_alloc(&fifo_elem_slab, (void **)&block.data, K_NO_WAIT)) {
LOG_ERR("USBD event memory corrupted");
__ASSERT_NO_MSG(0);
return NULL;