X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/2731c3a8aef715c2ea27d541e946200bd4fc189f..e5e34f91fa88fb95ab83c6cb8e10d313d4157a67:/Demos/Device/ClassDriver/AudioInput/AudioInput.c diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.c b/Demos/Device/ClassDriver/AudioInput/AudioInput.c index 58a3668e8..4bf1ef875 100644 --- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c +++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c @@ -52,7 +52,7 @@ USB_ClassInfo_Audio_Device_t Microphone_Audio_Interface = }; /** Current audio sampling frequency of the streaming audio endpoint. */ -uint32_t CurrentAudioSampleFrequency = 48000; +static uint32_t CurrentAudioSampleFrequency = 48000; /** Main program entry point. This routine contains the overall program flow, including initial @@ -98,7 +98,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK) { uint8_t PrevEndpoint = Endpoint_GetCurrentEndpoint(); - /* Check if the sample reload timer period has elapsed, and that the USB bus is ready for a new sample */ + /* Check that the USB bus is ready for the next sample to write */ if (Audio_Device_IsReadyForNextSample(&Microphone_Audio_Interface)) { int16_t AudioSample; @@ -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)