eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure that only the requested Audio class pipes are mapped to endpoints within the device for a specific Audio Host Class driver instance. 

Fix const-correctness of the Audio Host Class driver.
This commit is contained in:
Dean Camera 2011-06-13 00:19:40 +00:00
parent 6e0a26083a
commit deaab90089
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
LUFA/Drivers/USB/Class/Host/Audio.c
View File

@ -51,7 +51,8 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa
if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration) if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
return AUDIO_ENUMERROR_InvalidConfigDescriptor; return AUDIO_ENUMERROR_InvalidConfigDescriptor;
while (!(DataINEndpoint) || !(DataOUTEndpoint)) while ((AudioInterfaceInfo->Config.DataINPipeNumber && !(DataINEndpoint)) ||
(AudioInterfaceInfo->Config.DataOUTPipeNumber && !(DataOUTEndpoint)))
{ {
if (!(AudioControlInterface) || if (!(AudioControlInterface) ||
USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
@ -78,6 +79,9 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa
AudioStreamingInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t); AudioStreamingInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
DataINEndpoint = NULL;
DataOUTEndpoint = NULL;
continue; continue;
} }
@ -195,7 +199,7 @@ static uint8_t DComp_NextAudioInterfaceDataEndpoint(void* CurrentDescriptor)
} }
uint8_t Audio_Host_StartStopStreaming(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo, uint8_t Audio_Host_StartStopStreaming(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
bool EnableStreaming) const bool EnableStreaming)
{ {
if (!(AudioInterfaceInfo->State.IsActive)) if (!(AudioInterfaceInfo->State.IsActive))
return HOST_SENDCONTROL_DeviceDisconnected; return HOST_SENDCONTROL_DeviceDisconnected;
@ -208,7 +212,7 @@ uint8_t Audio_GetSetEndpointProperty(USB_ClassInfo_Audio_Host_t* const AudioInte
const uint8_t DataPipeIndex, const uint8_t DataPipeIndex,
const uint8_t EndpointProperty, const uint8_t EndpointProperty,
const uint8_t EndpointControl, const uint8_t EndpointControl,
uint16_t const DataLength, const uint16_t DataLength,
void* const Data) void* const Data)
{ {
if (!(AudioInterfaceInfo->State.IsActive)) if (!(AudioInterfaceInfo->State.IsActive))

4
LUFA/Drivers/USB/Class/Host/Audio.h
View File

@ -145,7 +145,7 @@
* \return A value from the \ref USB_Host_SendControlErrorCodes_t enum. * \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.
*/ */
uint8_t Audio_Host_StartStopStreaming(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo, uint8_t Audio_Host_StartStopStreaming(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
bool EnableStreaming); const bool EnableStreaming);
/** Gets or sets the specified property of a streaming audio class endpoint that is bound to a pipe in the given /** Gets or sets the specified property of a streaming audio class endpoint that is bound to a pipe in the given
* class instance. * class instance.
@ -165,7 +165,7 @@
const uint8_t DataPipeIndex, const uint8_t DataPipeIndex,
const uint8_t EndpointProperty, const uint8_t EndpointProperty,
const uint8_t EndpointControl, const uint8_t EndpointControl,
uint16_t const DataLength, const uint16_t DataLength,
void* const Data); void* const Data);
/* Inline Functions: */ /* Inline Functions: */