EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb_standard: Added computation of the total BOS length to build_bos_descriptor

Browse Source
This commit is contained in:
dragonmux
2022-08-11 09:38:14 +01:00
committed by Piotr Esden-Tempski
parent c0c642cb06
commit 8f69cc974d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/usb/usb_standard.c
View File

@@ -171,6 +171,7 @@ static uint16_t build_bos_descriptor(usbd_device *usbd_dev, uint8_t *const buf,
memcpy(buf, bos, count); memcpy(buf, bos, count);
len -= count; len -= count;
uint16_t total = count; uint16_t total = count;
uint16_t total_length = bos->bLength;
size_t offset = 0; size_t offset = 0;
for (uint8_t i = 0; i < bos->bNumDeviceCaps; ++i) { for (uint8_t i = 0; i < bos->bNumDeviceCaps; ++i) {
@@ -181,6 +182,7 @@ static uint16_t build_bos_descriptor(usbd_device *usbd_dev, uint8_t *const buf,
switch (dev_cap->bDevCapabilityType) { switch (dev_cap->bDevCapabilityType) {
case USB_DCT_PLATFORM: case USB_DCT_PLATFORM:
count = build_devcap_platform((const usb_platform_device_capability_descriptor *)dev_cap, buf + total, len); count = build_devcap_platform((const usb_platform_device_capability_descriptor *)dev_cap, buf + total, len);
total_length += dev_cap->bLength;
offset += sizeof(usb_platform_device_capability_descriptor) + MICROSOFT_OS_DESCRIPTOR_SET_INFORMATION_SIZE; offset += sizeof(usb_platform_device_capability_descriptor) + MICROSOFT_OS_DESCRIPTOR_SET_INFORMATION_SIZE;
break; break;
default: default:
@@ -190,10 +192,9 @@ static uint16_t build_bos_descriptor(usbd_device *usbd_dev, uint8_t *const buf,
return 0; return 0;
len -= count; len -= count;
total += count; total += count;
if (!count && !len)
return 0;
} }
((usb_bos_descriptor *)buf)->wTotalLength = total_length;
return total; return total;
} }