mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-19 06:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #466 from chang196700/feature/string_desc_msos

Browse Source 
Remove 0xEE index string if statement & change TU_ASSERT to TU_VERIFY
This commit is contained in:
Ha Thach 2020-07-21 20:25:08 +07:00 committed by GitHub
commit be744e1e01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/device/usbd.c
View File

@ -891,20 +891,11 @@ static bool process_get_descriptor(uint8_t rhport, tusb_control_request_t const
TU_LOG2(" String[%u]\r\n", desc_index); TU_LOG2(" String[%u]\r\n", desc_index);
// String Descriptor always uses the desc set from user // String Descriptor always uses the desc set from user
if ( desc_index == 0xEE ) uint8_t const* desc_str = (uint8_t const*) tud_descriptor_string_cb(desc_index, p_request->wIndex);
{ TU_VERIFY(desc_str);
// The 0xEE index string is a Microsoft OS Descriptors.
// https://docs.microsoft.com/en-us/windows-hardware/drivers/usbcon/microsoft-defined-usb-descriptors
return false;
}
else
{
uint8_t const* desc_str = (uint8_t const*) tud_descriptor_string_cb(desc_index, p_request->wIndex);
TU_ASSERT(desc_str);
// first byte of descriptor is its size // first byte of descriptor is its size
return tud_control_xfer(rhport, p_request, (void*) desc_str, desc_str[0]); return tud_control_xfer(rhport, p_request, (void*) desc_str, desc_str[0]);
}
break; break;
case TUSB_DESC_DEVICE_QUALIFIER: case TUSB_DESC_DEVICE_QUALIFIER: