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

samples: WebUSB: Fix MS OS 2.0 descriptor

Browse source 
The sample did not correctly select the WinUSB
driver for the WebUSB interface as required
on Windows when CDC ACM was included in the
build configuration (the case for e.g. nRF52840
Dongle).

Introduce correct function subset header in the
MS OS 2.0 descriptor.

Signed-off-by: Lars Knudsen <larsgk@gmail.com>
This commit is contained in:
Lars Knudsen 2023-12-12 19:02:37 +01:00 committed by Fabio Baltieri
parent dbd4b82f1c
commit 95f8c2666a
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
samples/subsys/usb/webusb/src/main.c
View file

@ -40,6 +40,9 @@ LOG_MODULE_REGISTER(main);
static struct msosv2_descriptor_t {
struct msosv2_descriptor_set_header header;
#if defined(CONFIG_USB_CDC_ACM)
struct msosv2_function_subset_header subset_header;
#endif
struct msosv2_compatible_id webusb_compatible_id;
struct msosv2_guids_property webusb_guids_property;
} __packed msosv2_descriptor = {
@ -52,6 +55,23 @@ static struct msosv2_descriptor_t {
.dwWindowsVersion = 0x06030000,
.wTotalLength = sizeof(struct msosv2_descriptor_t),
},
#if defined(CONFIG_USB_CDC_ACM)
/* If CONFIG_USB_CDC_ACM is selected, extra interfaces will be added on build time,
* making the target a composite device, which requires an extra Function
* Subset Header.
*/
.subset_header = {
.wLength = sizeof(struct msosv2_function_subset_header),
.wDescriptorType = MS_OS_20_SUBSET_HEADER_FUNCTION,
/* The WebUSB interface number becomes the first when CDC_ACM is enabled by
* configuration. Beware that if this sample is used as as inspiration for
* applications, where the WebUSB interface is no longer the first,
* remember to adjust bFirstInterface.
*/
.bFirstInterface = 0,
.wSubsetLength = 160
},
#endif
.webusb_compatible_id = {
.wLength = sizeof(struct msosv2_compatible_id),
.wDescriptorType = MS_OS_20_FEATURE_COMPATIBLE_ID,