diff options
| author | dean <dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-12-23 01:51:39 +0000 |
|---|---|---|
| committer | dean <dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-12-23 01:51:39 +0000 |
| commit | 9b0c63fa0a32478a8f5bdd90a9ab4a23a19cb1f0 (patch) | |
| tree | 9f38b5271f3a5ff10083f4f3e27598ced92efe11 /Demos/Device/ClassDriver/AudioInput | |
| parent | d5f67c6637f24c2c640d3c067ba74906ad791420 (diff) | |
Run wspurify script on /trunk/ and /branches/ C source files, to remove any trailing whitespace at the end of each line.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@2007 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Demos/Device/ClassDriver/AudioInput')
| -rw-r--r-- | Demos/Device/ClassDriver/AudioInput/AudioInput.c | 19 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/AudioInput/Descriptors.c | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.c b/Demos/Device/ClassDriver/AudioInput/AudioInput.c index 31e8d96a..f11122fd 100644 --- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c +++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c @@ -106,11 +106,11 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK) #if defined(USE_TEST_TONE) static uint8_t SquareWaveSampleCount; static int16_t CurrentWaveValue; - + /* In test tone mode, generate a square wave at 1/256 of the sample rate */ if (SquareWaveSampleCount++ == 0xFF) CurrentWaveValue ^= 0x8000; - + /* Only generate audio if the board button is being pressed */ AudioSample = (Buttons_GetStatus() & BUTTONS_BUTTON1) ? CurrentWaveValue : 0; #else @@ -122,7 +122,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK) AudioSample -= (SAMPLE_MAX_RANGE / 2); #endif #endif - + Audio_Device_WriteSample16(&Microphone_Audio_Interface, AudioSample); } @@ -211,10 +211,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) @@ -223,13 +223,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/AudioInput/Descriptors.c b/Demos/Device/ClassDriver/AudioInput/Descriptors.c index 2a6a7773..48059aff 100644 --- a/Demos/Device/ClassDriver/AudioInput/Descriptors.c +++ b/Demos/Device/ClassDriver/AudioInput/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), |