Merge branch 'fix-too-strict-iad-checks' into uac2

Conflicts:
	src/device/usbd.c
This commit is contained in:
Reinhard Panhuber
2020-06-14 12:36:59 +02:00

View File

@@ -778,9 +778,7 @@ static bool process_set_config(uint8_t rhport, uint8_t cfg_num)
{ {
// IAD's first interface number and class/subclass/protocol should match with opened interface // IAD's first interface number and class/subclass/protocol should match with opened interface
TU_ASSERT(desc_itf_assoc->bFirstInterface == desc_itf->bInterfaceNumber && TU_ASSERT(desc_itf_assoc->bFirstInterface == desc_itf->bInterfaceNumber &&
desc_itf_assoc->bFunctionClass == desc_itf->bInterfaceClass && desc_itf_assoc->bFunctionClass == desc_itf->bInterfaceClass);
// desc_itf_assoc->bFunctionSubClass == desc_itf->bInterfaceSubClass &&
desc_itf_assoc->bFunctionProtocol == desc_itf->bInterfaceProtocol);
for(uint8_t i=1; i<desc_itf_assoc->bInterfaceCount; i++) for(uint8_t i=1; i<desc_itf_assoc->bInterfaceCount; i++)
{ {