diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2011-12-23 01:51:39 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-12-23 01:51:39 +0000 |
commit | f201f6697b7f99b63389509b42112026b8f6f76f (patch) | |
tree | 9f38b5271f3a5ff10083f4f3e27598ced92efe11 /Demos/Device/ClassDriver/AudioOutput | |
parent | 77f354609f0411fb6541da31a889186ad402838e (diff) | |
download | lufa-f201f6697b7f99b63389509b42112026b8f6f76f.tar.gz lufa-f201f6697b7f99b63389509b42112026b8f6f76f.tar.bz2 lufa-f201f6697b7f99b63389509b42112026b8f6f76f.zip |
Run wspurify script on /trunk/ and /branches/ C source files, to remove any trailing whitespace at the end of each line.
Diffstat (limited to 'Demos/Device/ClassDriver/AudioOutput')
-rw-r--r-- | Demos/Device/ClassDriver/AudioOutput/AudioOutput.c | 19 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/AudioOutput/Descriptors.c | 2 | ||||
-rw-r--r-- | Demos/Device/ClassDriver/AudioOutput/Descriptors.h | 1 |
3 files changed, 12 insertions, 10 deletions
diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c index 8858999a2..88f82006e 100644 --- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c +++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c @@ -91,7 +91,7 @@ void SetupHardware(void) ISR(TIMER0_COMPA_vect, ISR_BLOCK) { uint8_t PrevEndpoint = Endpoint_GetCurrentEndpoint(); - + /* Check that the USB bus is ready for the next sample to read */ if (Audio_Device_IsSampleReceived(&Speaker_Audio_Interface)) { @@ -128,8 +128,8 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK) LEDs_SetAllLEDs(LEDMask); } - - Endpoint_SelectEndpoint(PrevEndpoint); + + Endpoint_SelectEndpoint(PrevEndpoint); } /** Event handler for the library USB Connection event. */ @@ -248,10 +248,10 @@ bool CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t* CurrentAudioSampleFrequency = (((uint32_t)Data[2] << 16) | ((uint32_t)Data[1] << 8) | (uint32_t)Data[0]); /* Adjust sample reload timer to the new frequency */ - OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1); + OCR0A = ((F_CPU / 8 / CurrentAudioSampleFrequency) - 1); } - - return true; + + return true; case AUDIO_REQ_GetCurrent: /* Check if we are just testing for a valid property, or actually reading it */ if (DataLength != NULL) @@ -260,13 +260,14 @@ bool CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t* Data[2] = (CurrentAudioSampleFrequency >> 16); Data[1] = (CurrentAudioSampleFrequency >> 8); - Data[0] = (CurrentAudioSampleFrequency & 0xFF); + Data[0] = (CurrentAudioSampleFrequency & 0xFF); } - + return true; } } } - + return false; } + diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c index 75a13bb7a..50d0bb6a0 100644 --- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c +++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c @@ -204,7 +204,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .TotalDiscreteSampleRates = (sizeof(ConfigurationDescriptor.Audio_AudioFormatSampleRates) / sizeof(USB_Audio_SampleFreq_t)), }, - + .Audio_AudioFormatSampleRates = { AUDIO_SAMPLE_FREQ(8000), diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h index da95077c4..aa551b00c 100644 --- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h +++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h @@ -83,3 +83,4 @@ ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); #endif + |