Skip to content

Commit ae86069

Browse files
AidenHuJosuah Demangeon
authored andcommitted
subsys: usb: host: remove root member for usbh_context
add usbh_device_get_root and usbh_device_is_root function to check root device Signed-off-by: Aiden Hu <[email protected]>
1 parent 4a67d82 commit ae86069

File tree

4 files changed

+44
-11
lines changed

4 files changed

+44
-11
lines changed

include/zephyr/usb/usbh.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ struct usbh_context {
5858
struct usbh_status status;
5959
/** USB device list */
6060
sys_dlist_t udevs;
61-
/** USB root device */
62-
struct usb_device *root;
6361
/** Allocated device addresses bit array */
6462
struct sys_bitarray *addr_ba;
6563
};

subsys/usb/host/usbh_core.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,30 +69,30 @@ static void dev_connected_handler(struct usbh_context *const ctx,
6969

7070
k_mutex_lock(&ctx->mutex, K_FOREVER);
7171
sys_dlist_append(&ctx->udevs, &udev->node);
72-
73-
if (ctx->root == NULL) {
74-
ctx->root = udev;
75-
}
7672
k_mutex_unlock(&ctx->mutex);
7773

7874
if (usbh_device_init(udev)) {
7975
LOG_ERR("Failed to reset new USB device");
8076
sys_dlist_remove(&udev->node);
8177
}
8278

83-
usbh_class_probe_device(ctx->root);
79+
usbh_class_probe_device(usbh_device_get_root(ctx));
8480
}
8581

8682
static void dev_removed_handler(struct usbh_context *const ctx)
8783
{
88-
if (ctx->root != NULL) {
89-
usbh_class_remove_all(ctx->root);
90-
usbh_device_free(ctx->root);
91-
ctx->root = NULL;
84+
struct usb_device *udev = NULL;
85+
86+
udev = usbh_device_get_root(ctx);
87+
88+
if (udev) {
89+
usbh_class_remove_all(udev);
90+
usbh_device_free(udev);
9291
LOG_DBG("Device removed");
9392
} else {
9493
LOG_DBG("Spurious device removed event");
9594
}
95+
/* TODO: handle remove for all of classes for the unattached device */
9696
}
9797

9898
static int discard_ep_request(struct usbh_context *const ctx,

subsys/usb/host/usbh_device.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,34 @@ int usbh_device_set_configuration(struct usb_device *const udev, const uint8_t n
447447
return err;
448448
}
449449

450+
struct usb_device *usbh_device_get_root(struct usbh_context *const ctx)
451+
{
452+
sys_dnode_t *node;
453+
454+
if (ctx == NULL) {
455+
return NULL;
456+
}
457+
458+
node = sys_dlist_peek_head(&ctx->udevs);
459+
if (node == NULL) {
460+
/* No devices in the list */
461+
return NULL;
462+
}
463+
464+
/* Get the usb_device structure from the node */
465+
return CONTAINER_OF(node, struct usb_device, node);
466+
}
467+
468+
bool usbh_device_is_root(struct usbh_context *const ctx,
469+
struct usb_device *const udev)
470+
{
471+
if (ctx == NULL || udev == NULL) {
472+
return false;
473+
}
474+
475+
return sys_dlist_peek_head(&ctx->udevs) == &udev->node;
476+
}
477+
450478
int usbh_device_init(struct usb_device *const udev)
451479
{
452480
struct usbh_context *const uhs_ctx = udev->ctx;

subsys/usb/host/usbh_device.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ int usbh_device_interface_set(struct usb_device *const udev,
3636
const uint8_t iface, const uint8_t alt,
3737
const bool dry);
3838

39+
/* Get root USB device */
40+
struct usb_device *usbh_device_get_root(struct usbh_context *const ctx);
41+
42+
/* Check if USB device is root */
43+
bool usbh_device_is_root(struct usbh_context *const ctx,
44+
struct usb_device *const udev);
45+
3946
/* Wrappers around to avoid glue UHC calls. */
4047
static inline struct uhc_transfer *usbh_xfer_alloc(struct usb_device *udev,
4148
const uint8_t ep,

0 commit comments

Comments
 (0)