forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename Audio Host Class driver internal descriptor matching routines to be in line with the rest of the class driver function names.

Browse Source
pull/1469/head
Dean Camera 14 years ago
parent deaab90089
commit f1cfd7ea7d
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File

14
LUFA/Drivers/USB/Class/Host/Audio.c
Unescape View File

@ -56,14 +56,14 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa
{ {
if (!(AudioControlInterface) || if (!(AudioControlInterface) ||
USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
DComp_NextAudioInterfaceDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) DCOMP_Audio_Host_NextAudioInterfaceDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
{ {
if (!(AudioControlInterface) || if (!(AudioControlInterface) ||
USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
DComp_NextAudioStreamInterface) != DESCRIPTOR_SEARCH_COMP_Found) DCOMP_Audio_Host_NextAudioStreamInterface) != DESCRIPTOR_SEARCH_COMP_Found)
{ {
if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
DComp_NextAudioControlInterface) != DESCRIPTOR_SEARCH_COMP_Found) DCOMP_Audio_Host_NextAudioControlInterface) != DESCRIPTOR_SEARCH_COMP_Found)
{ {
return AUDIO_ENUMERROR_NoCompatibleInterfaceFound; return AUDIO_ENUMERROR_NoCompatibleInterfaceFound;
} }
@ -71,7 +71,7 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa
AudioControlInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t); AudioControlInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
DComp_NextAudioStreamInterface) != DESCRIPTOR_SEARCH_COMP_Found) DCOMP_Audio_Host_NextAudioStreamInterface) != DESCRIPTOR_SEARCH_COMP_Found)
{ {
return AUDIO_ENUMERROR_NoCompatibleInterfaceFound; return AUDIO_ENUMERROR_NoCompatibleInterfaceFound;
} }
@ -141,7 +141,7 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa
return AUDIO_ENUMERROR_NoError; return AUDIO_ENUMERROR_NoError;
} }
static uint8_t DComp_NextAudioControlInterface(void* CurrentDescriptor) static uint8_t DCOMP_Audio_Host_NextAudioControlInterface(void* CurrentDescriptor)
{ {
USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t); USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
@ -160,7 +160,7 @@ static uint8_t DComp_NextAudioControlInterface(void* CurrentDescriptor)
return DESCRIPTOR_SEARCH_NotFound; return DESCRIPTOR_SEARCH_NotFound;
} }
static uint8_t DComp_NextAudioStreamInterface(void* CurrentDescriptor) static uint8_t DCOMP_Audio_Host_NextAudioStreamInterface(void* CurrentDescriptor)
{ {
USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t); USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
@ -179,7 +179,7 @@ static uint8_t DComp_NextAudioStreamInterface(void* CurrentDescriptor)
return DESCRIPTOR_SEARCH_NotFound; return DESCRIPTOR_SEARCH_NotFound;
} }
static uint8_t DComp_NextAudioInterfaceDataEndpoint(void* CurrentDescriptor) static uint8_t DCOMP_Audio_Host_NextAudioInterfaceDataEndpoint(void* CurrentDescriptor)
{ {
USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t); USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);

6
LUFA/Drivers/USB/Class/Host/Audio.h
Unescape View File

@ -393,9 +393,9 @@
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)
/* Function Prototypes: */ /* Function Prototypes: */
#if defined(__INCLUDE_FROM_AUDIO_HOST_C) #if defined(__INCLUDE_FROM_AUDIO_HOST_C)
static uint8_t DComp_NextAudioControlInterface(void* CurrentDescriptor); static uint8_t DCOMP_Audio_Host_NextAudioControlInterface(void* CurrentDescriptor);
static uint8_t DComp_NextAudioStreamInterface(void* CurrentDescriptor); static uint8_t DCOMP_Audio_Host_NextAudioStreamInterface(void* CurrentDescriptor);
static uint8_t DComp_NextAudioInterfaceDataEndpoint(void* CurrentDescriptor); static uint8_t DCOMP_Audio_Host_NextAudioInterfaceDataEndpoint(void* CurrentDescriptor);
#endif #endif
#endif #endif

2
LUFA/ManPages/ChangeLog.txt
Unescape View File

@ -22,6 +22,8 @@
* - Added RNDIS device mode to the Webserver project * - Added RNDIS device mode to the Webserver project
* - Added new incomplete AndroidAccessoryHost Host LowLevel demo * - Added new incomplete AndroidAccessoryHost Host LowLevel demo
* - Added new MediaControl project * - Added new MediaControl project
* - Added new AudioInputHost Host ClassDriver demo
* - Added new AudioOutputHost Host ClassDriver demo
* - Added new AudioInputHost Host LowLevel demo * - Added new AudioInputHost Host LowLevel demo
* - Added new AudioOutputHost Host LowLevel demo * - Added new AudioOutputHost Host LowLevel demo
* *

Write Preview
Loading…
Cancel
Save