patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

usb: device_next: use dlist instead of slist for descriptors list

Browse source 
While this does not provide much of an advantage yet,
it will allow us to add descriptors and assign an index
more easily in the next commit.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
This commit is contained in:
Johann Fischer 2023-05-17 17:25:48 +02:00 committed by Anas Nashif
parent 07ef9aaed4
commit 7e2d359e8f
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/zephyr/usb/usbd.h
View file

@ -62,7 +62,7 @@ extern "C" {
*/
struct usbd_desc_node {
/** slist node struct */
sys_snode_t node;
sys_dnode_t node;
/** Descriptor index, required for string descriptors */
unsigned int idx : 8;
/** If not set, string descriptor must be converted to UTF16LE */
@ -156,7 +156,7 @@ struct usbd_contex {
/** Middle layer runtime data */
struct usbd_ch9_data ch9_data;
/** slist to manage descriptors like string, bos */
sys_slist_t descriptors;
sys_dlist_t descriptors;
/** slist to manage device configurations */
sys_slist_t configs;
/** Status of the USB device support */

16
subsys/usb/device_next/usbd_desc.c
View file

@ -110,7 +110,7 @@ void *usbd_get_descriptor(struct usbd_contex *const uds_ctx,
struct usbd_desc_node *tmp;
struct usb_desc_header *dh;
SYS_SLIST_FOR_EACH_CONTAINER(&uds_ctx->descriptors, tmp, node) {
SYS_DLIST_FOR_EACH_CONTAINER(&uds_ctx->descriptors, tmp, node) {
dh = tmp->desc;
if (tmp->idx == idx && dh->bDescriptorType == type) {
return tmp->desc;
@ -123,9 +123,9 @@ void *usbd_get_descriptor(struct usbd_contex *const uds_ctx,
int usbd_desc_remove_all(struct usbd_contex *const uds_ctx)
{
struct usbd_desc_node *tmp;
sys_snode_t *node;
sys_dnode_t *node;
while ((node = sys_slist_get(&uds_ctx->descriptors))) {
while ((node = sys_dlist_get(&uds_ctx->descriptors))) {
tmp = CONTAINER_OF(node, struct usbd_desc_node, node);
LOG_DBG("Remove descriptor node %p", tmp);
}
@ -142,9 +142,15 @@ int usbd_add_descriptor(struct usbd_contex *const uds_ctx,
usbd_device_lock(uds_ctx);
/* Check if descriptor list is initialized */
if (!sys_dnode_is_linked(&uds_ctx->descriptors)) {
LOG_DBG("Initialize descriptors list");
sys_dlist_init(&uds_ctx->descriptors);
}
head = desc_nd->desc;
type = head->bDescriptorType;
if (usbd_get_descriptor(uds_ctx, type, desc_nd->idx)) {
if (sys_dnode_is_linked(&desc_nd->node)) {
ret = -EALREADY;
goto add_descriptor_error;
}
@ -181,7 +187,7 @@ int usbd_add_descriptor(struct usbd_contex *const uds_ctx,
}
}
sys_slist_append(&uds_ctx->descriptors, &desc_nd->node);
sys_dlist_append(&uds_ctx->descriptors, &desc_nd->node);
add_descriptor_error:
usbd_device_unlock(uds_ctx);