Clean up the Audio Device class driver control request Endpoint match logic.

pull/1469/head
Dean Camera 13 years ago
parent 2180f57d17
commit 81bd8f2f83

@ -49,17 +49,14 @@ void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const Audi
} }
else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT) else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT)
{ {
bool EndpointFilterMatch = false; uint8_t EndpointIndex = (USB_ControlRequest.wIndex & 0xFF);
EndpointFilterMatch |= (AudioInterfaceInfo->Config.DataINEndpointNumber && if ((EndpointIndex != (ENDPOINT_DIR_IN | AudioInterfaceInfo->Config.DataINEndpointNumber)) &&
((uint8_t)USB_ControlRequest.wIndex == (ENDPOINT_DIR_IN | AudioInterfaceInfo->Config.DataINEndpointNumber))); (EndpointIndex != (ENDPOINT_DIR_OUT | AudioInterfaceInfo->Config.DataOUTEndpointNumber)))
{
EndpointFilterMatch |= (AudioInterfaceInfo->Config.DataOUTEndpointNumber &&
((uint8_t)USB_ControlRequest.wIndex == (ENDPOINT_DIR_OUT | AudioInterfaceInfo->Config.DataOUTEndpointNumber)));
if (!(EndpointFilterMatch))
return; return;
} }
}
switch (USB_ControlRequest.bRequest) switch (USB_ControlRequest.bRequest)
{ {

Loading…
Cancel
Save