Ensure that only the requested Audio class pipes are mapped to endpoints within the...

Fix const-correctness of the Audio Host Class driver.

diff --git a/Demos/Host/ClassDriver/AudioInputHost/AudioInputHost.c b/Demos/Host/ClassDriver/AudioInputHost/AudioInputHost.c
index 93c1e72..35a4ef9 100644 (file)
--- a/Demos/Host/ClassDriver/AudioInputHost/AudioInputHost.c
+++ b/Demos/Host/ClassDriver/AudioInputHost/AudioInputHost.c
@@ -104,7 +104,7 @@ int main(void)
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
                                }\r
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
                                        break;\r
                                }\r

-                               \r
+                       \r

                                USB_Audio_SampleFreq_t SampleRate = AUDIO_SAMPLE_FREQ(48000);\r
                                if (Audio_GetSetEndpointProperty(&Microphone_Audio_Interface, Microphone_Audio_Interface.Config.DataINPipeNumber,\r
                                                                 AUDIO_REQ_SetCurrent, AUDIO_EPCONTROL_SamplingFreq,\r
                                USB_Audio_SampleFreq_t SampleRate = AUDIO_SAMPLE_FREQ(48000);\r
                                if (Audio_GetSetEndpointProperty(&Microphone_Audio_Interface, Microphone_Audio_Interface.Config.DataINPipeNumber,\r
                                                                 AUDIO_REQ_SetCurrent, AUDIO_EPCONTROL_SamplingFreq,\r

diff --git a/LUFA/Drivers/USB/Class/Host/Audio.c b/LUFA/Drivers/USB/Class/Host/Audio.c
index 5760b6a..2380913 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/Audio.c
+++ b/LUFA/Drivers/USB/Class/Host/Audio.c
@@ -51,7 +51,8 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa
        if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)\r
          return AUDIO_ENUMERROR_InvalidConfigDescriptor;\r
 \r
        if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)\r
          return AUDIO_ENUMERROR_InvalidConfigDescriptor;\r
 \r

-       while (!(DataINEndpoint) || !(DataOUTEndpoint))\r
+       while ((AudioInterfaceInfo->Config.DataINPipeNumber  && !(DataINEndpoint)) ||\r
+              (AudioInterfaceInfo->Config.DataOUTPipeNumber && !(DataOUTEndpoint)))\r

        {\r
                if (!(AudioControlInterface) ||\r
                    USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r
        {\r
                if (!(AudioControlInterface) ||\r
                    USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,\r


@@ -77,6 +78,9 @@ uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfa
                        }\r
 \r
                        AudioStreamingInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);\r
                        }\r
 \r
                        AudioStreamingInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);\r

+                       \r
+                       DataINEndpoint  = NULL;\r
+                       DataOUTEndpoint = NULL;\r

 \r
                        continue;\r
                }\r
 \r
                        continue;\r
                }\r


@@ -195,7 +199,7 @@ static uint8_t DComp_NextAudioInterfaceDataEndpoint(void* CurrentDescriptor)
 }\r
 \r
 uint8_t Audio_Host_StartStopStreaming(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,\r
 }\r
 \r
 uint8_t Audio_Host_StartStopStreaming(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,\r

-                                                 bool EnableStreaming)\r
+                                                 const bool EnableStreaming)\r

 {\r
        if (!(AudioInterfaceInfo->State.IsActive))\r
          return HOST_SENDCONTROL_DeviceDisconnected;\r
 {\r
        if (!(AudioInterfaceInfo->State.IsActive))\r
          return HOST_SENDCONTROL_DeviceDisconnected;\r


@@ -208,7 +212,7 @@ uint8_t Audio_GetSetEndpointProperty(USB_ClassInfo_Audio_Host_t* const AudioInte
                                                 const uint8_t DataPipeIndex,\r
                                                 const uint8_t EndpointProperty,\r
                                                 const uint8_t EndpointControl,\r
                                                 const uint8_t DataPipeIndex,\r
                                                 const uint8_t EndpointProperty,\r
                                                 const uint8_t EndpointControl,\r

-                                                uint16_t const DataLength,\r
+                                                const uint16_t DataLength,\r

                                                 void* const Data)\r
 {\r
        if (!(AudioInterfaceInfo->State.IsActive))\r
                                                 void* const Data)\r
 {\r
        if (!(AudioInterfaceInfo->State.IsActive))\r

diff --git a/LUFA/Drivers/USB/Class/Host/Audio.h b/LUFA/Drivers/USB/Class/Host/Audio.h
index 26d5376..91ea0e2 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/Audio.h
+++ b/LUFA/Drivers/USB/Class/Host/Audio.h
@@ -145,7 +145,7 @@
                         *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.\r
                         */\r
                        uint8_t Audio_Host_StartStopStreaming(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,\r
                         *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.\r
                         */\r
                        uint8_t Audio_Host_StartStopStreaming(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,\r

-                                                             bool EnableStreaming);\r
+                                                             const bool EnableStreaming);\r

 \r
                        /** Gets or sets the specified property of a streaming audio class endpoint that is bound to a pipe in the given\r
                         *  class instance.\r
 \r
                        /** Gets or sets the specified property of a streaming audio class endpoint that is bound to a pipe in the given\r
                         *  class instance.\r


@@ -165,7 +165,7 @@
                                                             const uint8_t DataPipeIndex,\r
                                                             const uint8_t EndpointProperty,\r
                                                             const uint8_t EndpointControl,\r
                                                             const uint8_t DataPipeIndex,\r
                                                             const uint8_t EndpointProperty,\r
                                                             const uint8_t EndpointControl,\r

-                                                            uint16_t const DataLength,\r
+                                                            const uint16_t DataLength,\r

                                                             void* const Data);\r
 \r
                /* Inline Functions: */\r
                                                             void* const Data);\r
 \r
                /* Inline Functions: */\r