diff options
| author | Dean Camera <[email protected]> | 2011-06-07 02:05:19 +0000 |
|---|---|---|
| committer | Dean Camera <[email protected]> | 2011-06-07 02:05:19 +0000 |
| commit | 567f7ecce0d04c2406b2379eb34ef3e54178a6d1 (patch) | |
| tree | 7a4ba143776c89e2f378d0e99d6fd4c296444ac6 /Demos/Device/LowLevel/AudioOutput/AudioOutput.c | |
| parent | 2d778a3ff55ace56359bcb9195bb4731a6dd15b5 (diff) | |
| download | qmk_firmware-567f7ecce0d04c2406b2379eb34ef3e54178a6d1.tar.gz qmk_firmware-567f7ecce0d04c2406b2379eb34ef3e54178a6d1.zip | |
Fix errors in the Audio device demos and class driver regarding multiple sample frequency support.
Diffstat (limited to 'Demos/Device/LowLevel/AudioOutput/AudioOutput.c')
| -rw-r--r-- | Demos/Device/LowLevel/AudioOutput/AudioOutput.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c index c5d9363001..fcc3d5abde 100644 --- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c +++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c @@ -186,12 +186,12 @@ void EVENT_USB_Device_ControlRequest(void) case AUDIO_REQ_SetCurrent: if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_ENDPOINT)) { - /* Extract out the relevant request information to get the target Endpoint index and control being set */ - uint8_t EndpointIndex = (uint8_t)USB_ControlRequest.wIndex; + /* Extract out the relevant request information to get the target Endpoint address and control being set */ + uint8_t EndpointAddress = (uint8_t)USB_ControlRequest.wIndex; uint8_t EndpointControl = (USB_ControlRequest.wValue >> 8); /* Only handle SET CURRENT requests to the audio endpoint's sample frequency property */ - if ((EndpointIndex == AUDIO_STREAM_EPNUM) && (EndpointControl == AUDIO_EPCONTROL_SamplingFreq)) + if ((EndpointAddress == (ENDPOINT_DESCRIPTOR_DIR_OUT | AUDIO_STREAM_EPNUM)) && (EndpointControl == AUDIO_EPCONTROL_SamplingFreq)) { uint8_t SampleRate[3]; @@ -211,12 +211,12 @@ void EVENT_USB_Device_ControlRequest(void) case AUDIO_REQ_GetCurrent: if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_ENDPOINT)) { - /* Extract out the relevant request information to get the target Endpoint index and control being retrieved */ - uint8_t EndpointIndex = (uint8_t)USB_ControlRequest.wIndex; + /* Extract out the relevant request information to get the target Endpoint address and control being retrieved */ + uint8_t EndpointAddress = (uint8_t)USB_ControlRequest.wIndex; uint8_t EndpointControl = (USB_ControlRequest.wValue >> 8); /* Only handle GET CURRENT requests to the audio endpoint's sample frequency property */ - if ((EndpointIndex == AUDIO_STREAM_EPNUM) && (EndpointControl == AUDIO_EPCONTROL_SamplingFreq)) + if ((EndpointAddress == (ENDPOINT_DESCRIPTOR_DIR_OUT | AUDIO_STREAM_EPNUM)) && (EndpointControl == AUDIO_EPCONTROL_SamplingFreq)) { uint8_t SampleRate[3]; |
