diff options
| author | Ha Thach <[email protected]> | 2020-07-21 20:25:08 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-21 20:25:08 +0700 |
| commit | be744e1e0149f16c02d1fc6b1e6ef4ab55fcbeeb (patch) | |
| tree | 602afbd20ae23356d756bb6533805dc5f095b37b /src | |
| parent | 1e2c554919bb079d5402449924f4415ed7123c62 (diff) | |
| parent | 5cd654838ba590ab49b637ead744cc0bae671946 (diff) | |
Merge pull request #466 from chang196700/feature/string_desc_msos
Remove 0xEE index string if statement & change TU_ASSERT to TU_VERIFY
Diffstat (limited to 'src')
| -rw-r--r-- | src/device/usbd.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/device/usbd.c b/src/device/usbd.c index f59b19427..9faa3549f 100644 --- a/src/device/usbd.c +++ b/src/device/usbd.c @@ -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); // String Descriptor always uses the desc set from user - if ( desc_index == 0xEE ) - { - // 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); + uint8_t const* desc_str = (uint8_t const*) tud_descriptor_string_cb(desc_index, p_request->wIndex); + TU_VERIFY(desc_str); - // first byte of descriptor is its size - return tud_control_xfer(rhport, p_request, (void*) desc_str, desc_str[0]); - } + // first byte of descriptor is its size + return tud_control_xfer(rhport, p_request, (void*) desc_str, desc_str[0]); break; case TUSB_DESC_DEVICE_QUALIFIER: |