Skip to content

app: usb: add support for the MSOSv2 descriptor when using usbd_next #56

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

Merged
henrikbrixandersen merged 1 commit into from
Dec 22, 2024
Merged

app: usb: add support for the MSOSv2 descriptor when using usbd_next #56

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
34 changes: 18 additions & 16 deletions app/src/usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,7 @@ struct cannectivity_msosv2_descriptor {
'1', 0x00, '6', 0x00, 'F', 0x00, 'A', 0x00, '2', 0x00, 'D', 0x00, \
'5', 0x00, '}', 0x00, 0x00, 0x00

/*
* TODO: MSOSv2 not possible in device_next yet. See
* https://github.com/zephyrproject-rtos/zephyr/issues/76224
*/
__maybe_unused static const struct cannectivity_msosv2_descriptor cannectivity_msosv2_descriptor = {
static const struct cannectivity_msosv2_descriptor cannectivity_msosv2_descriptor = {
.header = {
.wLength = sizeof(struct msosv2_descriptor_set_header),
.wDescriptorType = MS_OS_20_SET_HEADER_DESCRIPTOR,
Expand Down Expand Up @@ -139,11 +135,23 @@ USBD_CONFIGURATION_DEFINE(fs_config, 0U, CONFIG_CANNECTIVITY_USB_MAX_POWER, &fs_
USBD_CONFIGURATION_DEFINE(hs_config, 0U, CONFIG_CANNECTIVITY_USB_MAX_POWER, &hs_config_desc);

USBD_DESC_BOS_DEFINE(usbext, sizeof(bos_cap_lpm), &bos_cap_lpm);
/*
* TODO: MSOSv2 not possible in device_next yet. See
* https://github.com/zephyrproject-rtos/zephyr/issues/76224
*/
__maybe_unused USBD_DESC_BOS_DEFINE(msosv2, sizeof(bos_cap_msosv2), &bos_cap_msosv2);

static int cannectivity_usb_vendorcode_handler(const struct usbd_context *const ctx,
const struct usb_setup_packet *const setup,
struct net_buf *const buf)
{
if (setup->bRequest == GS_USB_MS_VENDORCODE && setup->wIndex == MS_OS_20_DESCRIPTOR_INDEX) {
net_buf_add_mem(buf, &cannectivity_msosv2_descriptor,
MIN(net_buf_tailroom(buf), sizeof(cannectivity_msosv2_descriptor)));

return 0;
}

return -ENOTSUP;
}

USBD_DESC_BOS_VREQ_DEFINE(msosv2, sizeof(bos_cap_msosv2), &bos_cap_msosv2,
GS_USB_MS_VENDORCODE, cannectivity_usb_vendorcode_handler, NULL);

static int cannectivity_usb_init_usbd(void)
{
Expand Down Expand Up @@ -236,17 +244,11 @@ static int cannectivity_usb_init_usbd(void)
return err;
}

#if 0
/*
* TODO: MSOSv2 not possible in device_next yet. See
* https://github.com/zephyrproject-rtos/zephyr/issues/76224
*/
err = usbd_add_descriptor(&usbd, &msosv2);
if (err != 0) {
LOG_ERR("failed to add Microsoft OS 2.0 descriptor (err %d)", err);
return err;
}
#endif /* 0 */

err = usbd_init(&usbd);
if (err != 0) {
Expand Down