From f1cfd7ea7d052f0151024f3be9995a788f8fccea Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 14 Jun 2011 12:44:41 +0000 Subject: [PATCH] Rename Audio Host Class driver internal descriptor matching routines to be in line with the rest of the class driver function names. --- LUFA/Drivers/USB/Class/Host/Audio.c | 14 +++++++------- LUFA/Drivers/USB/Class/Host/Audio.h | 6 +++--- LUFA/ManPages/ChangeLog.txt | 2 ++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/LUFA/Drivers/USB/Class/Host/Audio.c b/LUFA/Drivers/USB/Class/Host/Audio.c index 238091321a..1d590e8414 100644 --- a/LUFA/Drivers/USB/Class/Host/Audio.c +++ b/LUFA/Drivers/USB/Class/Host/Audio.c @@ -56,14 +56,14 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa { if (!(AudioControlInterface) || USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - DComp_NextAudioInterfaceDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) + DCOMP_Audio_Host_NextAudioInterfaceDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) { if (!(AudioControlInterface) || USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - DComp_NextAudioStreamInterface) != DESCRIPTOR_SEARCH_COMP_Found) + DCOMP_Audio_Host_NextAudioStreamInterface) != DESCRIPTOR_SEARCH_COMP_Found) { if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - DComp_NextAudioControlInterface) != DESCRIPTOR_SEARCH_COMP_Found) + DCOMP_Audio_Host_NextAudioControlInterface) != DESCRIPTOR_SEARCH_COMP_Found) { 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); if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, - DComp_NextAudioStreamInterface) != DESCRIPTOR_SEARCH_COMP_Found) + DCOMP_Audio_Host_NextAudioStreamInterface) != DESCRIPTOR_SEARCH_COMP_Found) { return AUDIO_ENUMERROR_NoCompatibleInterfaceFound; } @@ -141,7 +141,7 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa 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); @@ -160,7 +160,7 @@ static uint8_t DComp_NextAudioControlInterface(void* CurrentDescriptor) 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); @@ -179,7 +179,7 @@ static uint8_t DComp_NextAudioStreamInterface(void* CurrentDescriptor) 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); diff --git a/LUFA/Drivers/USB/Class/Host/Audio.h b/LUFA/Drivers/USB/Class/Host/Audio.h index 91ea0e2650..81dcedbcd4 100644 --- a/LUFA/Drivers/USB/Class/Host/Audio.h +++ b/LUFA/Drivers/USB/Class/Host/Audio.h @@ -393,9 +393,9 @@ #if !defined(__DOXYGEN__) /* Function Prototypes: */ #if defined(__INCLUDE_FROM_AUDIO_HOST_C) - static uint8_t DComp_NextAudioControlInterface(void* CurrentDescriptor); - static uint8_t DComp_NextAudioStreamInterface(void* CurrentDescriptor); - static uint8_t DComp_NextAudioInterfaceDataEndpoint(void* CurrentDescriptor); + static uint8_t DCOMP_Audio_Host_NextAudioControlInterface(void* CurrentDescriptor); + static uint8_t DCOMP_Audio_Host_NextAudioStreamInterface(void* CurrentDescriptor); + static uint8_t DCOMP_Audio_Host_NextAudioInterfaceDataEndpoint(void* CurrentDescriptor); #endif #endif diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index c7401ea72a..1e236a44a4 100644 --- a/LUFA/ManPages/ChangeLog.txt +++ b/LUFA/ManPages/ChangeLog.txt @@ -22,6 +22,8 @@ * - Added RNDIS device mode to the Webserver project * - Added new incomplete AndroidAccessoryHost Host LowLevel demo * - Added new MediaControl project + * - Added new AudioInputHost Host ClassDriver demo + * - Added new AudioOutputHost Host ClassDriver demo * - Added new AudioInputHost Host LowLevel demo * - Added new AudioOutputHost Host LowLevel demo *