mirror/tinyusb
3
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2026-08-18 02:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

examples/midi2: add the descriptor callbacks its HS config requires

Browse Source 
This branch gave midi2_device a high-speed configuration (master had none)
without tud_descriptor_device_qualifier_cb or
tud_descriptor_other_speed_configuration_cb, leaving usbd's weak stubs
returning NULL so GET_DESCRIPTOR(DEVICE_QUALIFIER) stalled EP0 - which USB 2.0
9.6.2 forbids for a device reporting bcdUSB 0x0200. Both callbacks now follow
the pattern every other example with an HS config uses.
This commit is contained in:
hathach
2026-08-14 23:56:38 +07:00
parent 405f5caf39
commit 5b95631574
1 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
examples/device/midi2_device/src/usb_descriptors.c
View File

@ -220,6 +220,45 @@ uint8_t const * tud_descriptor_configuration_cb(uint8_t index) {
#endif
}
#if TUD_OPT_HIGH_SPEED
// A device reporting bcdUSB 0x0200 must answer GET_DESCRIPTOR(DEVICE_QUALIFIER) and
// OTHER_SPEED_CONFIGURATION (USB 2.0 section 9.6.2): without these callbacks usbd's weak stubs
// return NULL and stall EP0, which a high-speed-capable device may not do.
static uint8_t desc_other_speed_config[CONFIG_TOTAL_LEN];
static tusb_desc_device_qualifier_t const desc_device_qualifier = {
.bLength = sizeof(tusb_desc_device_qualifier_t),
.bDescriptorType = TUSB_DESC_DEVICE_QUALIFIER,
.bcdUSB = 0x0200,
.bDeviceClass = 0x00,
.bDeviceSubClass = 0x00,
.bDeviceProtocol = 0x00,
.bMaxPacketSize0 = EP0_SIZE_FSHS,
.bNumConfigurations = 0x01,
.bReserved = 0x00
};
// Invoked when received GET DEVICE QUALIFIER DESCRIPTOR request
uint8_t const *tud_descriptor_device_qualifier_cb(void) {
return (uint8_t const *) &desc_device_qualifier;
}
// Invoked when received GET OTHER SPEED CONFIGURATION DESCRIPTOR request
uint8_t const *tud_descriptor_other_speed_configuration_cb(uint8_t index) {
(void) index; // for multiple configurations
// if link speed is high return fullspeed config, and vice versa
// Note: the descriptor type is OTHER_SPEED_CONFIG instead of CONFIG
memcpy(desc_other_speed_config,
(tud_speed_get() == TUSB_SPEED_HIGH) ? desc_fs_configuration : desc_hs_configuration,
CONFIG_TOTAL_LEN);
desc_other_speed_config[1] = TUSB_DESC_OTHER_SPEED_CONFIG;
return desc_other_speed_config;
}
#endif // TUD_OPT_HIGH_SPEED
//--------------------------------------------------------------------+
// String Descriptors
//--------------------------------------------------------------------+