mirror/tinyusb
3
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2026-03-06 23:54:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3383 from hathach/audio_open

Browse Source 
audio: fix audiod_open with midi interfaces
This commit is contained in:
Ha Thach
2025-12-13 07:26:50 +07:00
committed by GitHub
parent 02da4e81c7 bb1495966d
commit 09f71727d5
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/class/audio/audio_device.c
View File

@ -800,20 +800,44 @@ uint16_t audiod_open(uint8_t rhport, tusb_desc_interface_t const *itf_desc, uint
(void) max_len;
TU_VERIFY(TUSB_CLASS_AUDIO == itf_desc->bInterfaceClass &&
AUDIO_SUBCLASS_CONTROL == itf_desc->bInterfaceSubClass);
AUDIO_SUBCLASS_CONTROL == itf_desc->bInterfaceSubClass, 0);
// Verify version is correct - this check can be omitted
TU_VERIFY(itf_desc->bInterfaceProtocol == AUDIO_INT_PROTOCOL_CODE_V1 ||
itf_desc->bInterfaceProtocol == AUDIO_INT_PROTOCOL_CODE_V2);
itf_desc->bInterfaceProtocol == AUDIO_INT_PROTOCOL_CODE_V2, 0);
// Verify 2nd interface descriptor is Audio Streaming to avoid mess with MIDI class
// Audio Control interface is followed by Audio Streaming interface(s)
// MIDI class also starts with Audio Control but is followed by MIDI Streaming
{
uint8_t const *p_desc = (uint8_t const *) itf_desc;
uint8_t const *p_desc_end = p_desc + max_len;
// Advance to next interface descriptor
p_desc = tu_desc_next(p_desc);
while (tu_desc_in_bounds(p_desc, p_desc_end) && tu_desc_type(p_desc) != TUSB_DESC_INTERFACE) {
p_desc = tu_desc_next(p_desc);
}
// Verify next interface is Audio Streaming (subclass 2), not MIDI Streaming (subclass 3)
if (p_desc_end - p_desc >= (int)sizeof(tusb_desc_interface_t)) {
tusb_desc_interface_t const *next_itf = (tusb_desc_interface_t const *) p_desc;
TU_VERIFY(next_itf->bInterfaceClass == TUSB_CLASS_AUDIO &&
next_itf->bInterfaceSubClass == AUDIO_SUBCLASS_STREAMING, 0);
} else {
// No further interface found or not enough bytes for interface descriptor
return 0;
}
}
// Verify interrupt control EP is enabled if demanded by descriptor
TU_ASSERT(itf_desc->bNumEndpoints <= 1);// 0 or 1 EPs are allowed
TU_ASSERT(itf_desc->bNumEndpoints <= 1, 0);// 0 or 1 EPs are allowed
if (itf_desc->bNumEndpoints == 1) {
TU_ASSERT(CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP);
TU_ASSERT(CFG_TUD_AUDIO_ENABLE_INTERRUPT_EP, 0);
}
// Alternate setting MUST be zero - this check can be omitted
TU_VERIFY(itf_desc->bAlternateSetting == 0);
TU_VERIFY(itf_desc->bAlternateSetting == 0, 0);
// Find available audio driver interface
uint8_t i;