gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-06 08:22:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update AudioInput and AudioOutput Class Driver device mode demos to use a switch statement when selecting the audio request type for clarity.

Browse Source
This commit is contained in:
Dean Camera 2011-06-29 05:36:26 +00:00
parent 8c3d421a01
commit 75da0d1877
3 changed files with 47 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Demos/Device/ClassDriver/AudioInput/AudioInput.c
View File

@ -201,34 +201,32 @@ bool CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t*
/* Check the requested control to see if a supported control is being manipulated */ /* Check the requested control to see if a supported control is being manipulated */
if (EndpointControl == AUDIO_EPCONTROL_SamplingFreq) if (EndpointControl == AUDIO_EPCONTROL_SamplingFreq)
{ {
/* Check the requested property to see if a supported property is being manipulated */ switch (EndpointProperty)
if (EndpointProperty == AUDIO_REQ_SetCurrent)
{ {
/* Check if we are just testing for a valid property, or actually adjusting it */ case AUDIO_REQ_SetCurrent:
if (DataLength != NULL) /* Check if we are just testing for a valid property, or actually adjusting it */
{ if (DataLength != NULL)
/* Set the new sampling frequency to the value given by the host */ {
CurrentAudioSampleFrequency = (((uint32_t)Data[2] << 16) | ((uint32_t)Data[1] << 8) | (uint32_t)Data[0]); /* Set the new sampling frequency to the value given by the host */
CurrentAudioSampleFrequency = (((uint32_t)Data[2] << 16) | ((uint32_t)Data[1] << 8) | (uint32_t)Data[0]);
/* Adjust sample reload timer to the new frequency */ /* 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:
else if (EndpointProperty == AUDIO_REQ_GetCurrent) /* Check if we are just testing for a valid property, or actually reading it */
{ if (DataLength != NULL)
/* Check if we are just testing for a valid property, or actually reading it */ {
if (DataLength != NULL) *DataLength = 3;
{
*DataLength = 3;
Data[2] = (CurrentAudioSampleFrequency >> 16); Data[2] = (CurrentAudioSampleFrequency >> 16);
Data[1] = (CurrentAudioSampleFrequency >> 8); Data[1] = (CurrentAudioSampleFrequency >> 8);
Data[0] = (CurrentAudioSampleFrequency & 0xFF); Data[0] = (CurrentAudioSampleFrequency & 0xFF);
} }
return true; return true;
} }
} }
} }

48
Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
View File

@ -238,34 +238,32 @@ bool CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t*
/* Check the requested control to see if a supported control is being manipulated */ /* Check the requested control to see if a supported control is being manipulated */
if (EndpointControl == AUDIO_EPCONTROL_SamplingFreq) if (EndpointControl == AUDIO_EPCONTROL_SamplingFreq)
{ {
/* Check the requested property to see if a supported property is being manipulated */ switch (EndpointProperty)
if (EndpointProperty == AUDIO_REQ_SetCurrent)
{ {
/* Check if we are just testing for a valid property, or actually adjusting it */ case AUDIO_REQ_SetCurrent:
if (DataLength != NULL) /* Check if we are just testing for a valid property, or actually adjusting it */
{ if (DataLength != NULL)
/* Set the new sampling frequency to the value given by the host */ {
CurrentAudioSampleFrequency = (((uint32_t)Data[2] << 16) | ((uint32_t)Data[1] << 8) | (uint32_t)Data[0]); /* Set the new sampling frequency to the value given by the host */
CurrentAudioSampleFrequency = (((uint32_t)Data[2] << 16) | ((uint32_t)Data[1] << 8) | (uint32_t)Data[0]);
/* Adjust sample reload timer to the new frequency */ /* 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:
else if (EndpointProperty == AUDIO_REQ_GetCurrent) /* Check if we are just testing for a valid property, or actually reading it */
{ if (DataLength != NULL)
/* Check if we are just testing for a valid property, or actually reading it */ {
if (DataLength != NULL) *DataLength = 3;
{
*DataLength = 3;
Data[2] = (CurrentAudioSampleFrequency >> 16); Data[2] = (CurrentAudioSampleFrequency >> 16);
Data[1] = (CurrentAudioSampleFrequency >> 8); Data[1] = (CurrentAudioSampleFrequency >> 8);
Data[0] = (CurrentAudioSampleFrequency & 0xFF); Data[0] = (CurrentAudioSampleFrequency & 0xFF);
} }
return true; return true;
} }
} }
} }

2
LUFA.pnproj
View File

File diff suppressed because one or more lines are too long