diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-06-07 02:05:19 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-06-07 02:05:19 +0000 |
| commit | 567f7ecce0d04c2406b2379eb34ef3e54178a6d1 (patch) | |
| tree | 7a4ba143776c89e2f378d0e99d6fd4c296444ac6 /Demos/Device/ClassDriver | |
| parent | 2d778a3ff55ace56359bcb9195bb4731a6dd15b5 (diff) | |
| download | lufa-567f7ecce0d04c2406b2379eb34ef3e54178a6d1.tar.gz lufa-567f7ecce0d04c2406b2379eb34ef3e54178a6d1.tar.bz2 lufa-567f7ecce0d04c2406b2379eb34ef3e54178a6d1.zip | |
Fix errors in the Audio device demos and class driver regarding multiple sample frequency support.
Diffstat (limited to 'Demos/Device/ClassDriver')
| -rw-r--r-- | Demos/Device/ClassDriver/AudioInput/AudioInput.c | 4 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/AudioOutput/AudioOutput.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.c b/Demos/Device/ClassDriver/AudioInput/AudioInput.c index 1acf20de8..447cb91dd 100644 --- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c +++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c @@ -190,13 +190,13 @@ void EVENT_USB_Device_ControlRequest(void) */ bool CALLBACK_Audio_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const uint8_t EndpointProperty, - const uint8_t EndpointIndex, + const uint8_t EndpointAddress, const uint8_t EndpointControl, uint16_t* const DataLength, uint8_t* Data) { /* Check the requested endpoint to see if a supported endpoint is being manipulated */ - if (EndpointIndex == Microphone_Audio_Interface.Config.DataINEndpointNumber) + if (EndpointAddress == (ENDPOINT_DESCRIPTOR_DIR_IN | Microphone_Audio_Interface.Config.DataINEndpointNumber)) { /* Check the requested control to see if a supported control is being manipulated */ if (EndpointControl == AUDIO_EPCONTROL_SamplingFreq) diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c index 77727f05e..f1d606070 100644 --- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c +++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c @@ -226,13 +226,13 @@ void EVENT_USB_Device_ControlRequest(void) */ bool CALLBACK_Audio_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo, const uint8_t EndpointProperty, - const uint8_t EndpointIndex, + const uint8_t EndpointAddress, const uint8_t EndpointControl, uint16_t* const DataLength, uint8_t* Data) { /* Check the requested endpoint to see if a supported endpoint is being manipulated */ - if (EndpointIndex == Speaker_Audio_Interface.Config.DataOUTEndpointNumber) + if (EndpointAddress == (ENDPOINT_DESCRIPTOR_DIR_OUT | Speaker_Audio_Interface.Config.DataOUTEndpointNumber)) { /* Check the requested control to see if a supported control is being manipulated */ if (EndpointControl == AUDIO_EPCONTROL_SamplingFreq) |