sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

driver/audio: remove unnecessary switch in switch

Browse Source 
- There is unnecessary switch inside switch which is making code not too readable

Signed-off-by: Manish Kumar Sharma <manishsharma3134@gmail.com>
This commit is contained in:
Manish Kumar Sharma 2023-07-16 00:44:32 +05:30 committed by Xiang Xiao
parent dbd13c2aca
commit 6a1abbcf56
3 changed files with 22 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/audio/audio_dma.c
View File

@ -156,10 +156,8 @@ static int audio_dma_getcaps(struct audio_lowerhalf_s *dev, int type,
caps->ac_channels = 2; /* Stereo output */ caps->ac_channels = 2; /* Stereo output */
switch (caps->ac_subtype) if (caps->ac_subtype == AUDIO_TYPE_QUERY)
{ {
case AUDIO_TYPE_QUERY:
/* We don't decode any formats! Only something above us in /* We don't decode any formats! Only something above us in
* the audio stream can perform decoding on our behalf. * the audio stream can perform decoding on our behalf.
*/ */
@ -167,17 +165,18 @@ static int audio_dma_getcaps(struct audio_lowerhalf_s *dev, int type,
/* The types of audio units we implement */ /* The types of audio units we implement */
if (audio_dma->playback) if (audio_dma->playback)
{
caps->ac_controls.b[0] = AUDIO_TYPE_OUTPUT; caps->ac_controls.b[0] = AUDIO_TYPE_OUTPUT;
}
else else
{
caps->ac_controls.b[0] = AUDIO_TYPE_INPUT; caps->ac_controls.b[0] = AUDIO_TYPE_INPUT;
caps->ac_format.hw = 1 << (AUDIO_FMT_PCM - 1);
break;
default:
caps->ac_controls.b[0] = AUDIO_SUBFMT_END;
break;
} }
caps->ac_format.hw = 1 << (AUDIO_FMT_PCM - 1);
}
caps->ac_controls.b[0] = AUDIO_SUBFMT_END;
break; break;
/* Provide capabilities of our OUTPUT unit */ /* Provide capabilities of our OUTPUT unit */
@ -187,25 +186,11 @@ static int audio_dma_getcaps(struct audio_lowerhalf_s *dev, int type,
caps->ac_channels = 2; caps->ac_channels = 2;
switch (caps->ac_subtype) if (caps->ac_subtype == AUDIO_TYPE_QUERY)
{ {
case AUDIO_TYPE_QUERY:
/* Report the Sample rates we support */ /* Report the Sample rates we support */
caps->ac_controls.hw[0] = AUDIO_SAMP_RATE_8K | caps->ac_controls.hw[0] = AUDIO_SAMP_RATE_DEF_ALL;
AUDIO_SAMP_RATE_11K |
AUDIO_SAMP_RATE_16K |
AUDIO_SAMP_RATE_22K |
AUDIO_SAMP_RATE_32K |
AUDIO_SAMP_RATE_44K |
AUDIO_SAMP_RATE_48K |
AUDIO_SAMP_RATE_96K |
AUDIO_SAMP_RATE_128K |
AUDIO_SAMP_RATE_160K |
AUDIO_SAMP_RATE_172K |
AUDIO_SAMP_RATE_192K;
break;
} }
break; break;

27
drivers/audio/audio_i2s.c
View File

@ -151,10 +151,8 @@ static int audio_i2s_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
* must then call us back for specific info for each capability. * must then call us back for specific info for each capability.
*/ */
switch (caps->ac_subtype) if (caps->ac_subtype == AUDIO_TYPE_QUERY)
{ {
case AUDIO_TYPE_QUERY:
/* We don't decode any formats! Only something above us in /* We don't decode any formats! Only something above us in
* the audio stream can perform decoding on our behalf. * the audio stream can perform decoding on our behalf.
*/ */
@ -172,11 +170,9 @@ static int audio_i2s_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
caps->ac_format.hw = 1 << (AUDIO_FMT_PCM - 1); caps->ac_format.hw = 1 << (AUDIO_FMT_PCM - 1);
break; break;
default:
caps->ac_controls.b[0] = AUDIO_SUBFMT_END;
break;
} }
caps->ac_controls.b[0] = AUDIO_SUBFMT_END;
break; break;
/* Provide capabilities of our OUTPUT unit */ /* Provide capabilities of our OUTPUT unit */
@ -184,26 +180,13 @@ static int audio_i2s_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
case AUDIO_TYPE_OUTPUT: case AUDIO_TYPE_OUTPUT:
case AUDIO_TYPE_INPUT: case AUDIO_TYPE_INPUT:
switch (caps->ac_subtype) if (caps->ac_subtype == AUDIO_TYPE_QUERY)
{ {
case AUDIO_TYPE_QUERY:
/* Report the Sample rates we support */ /* Report the Sample rates we support */
caps->ac_controls.hw[0] = caps->ac_controls.hw[0] = AUDIO_SAMP_RATE_DEF_ALL;
AUDIO_SAMP_RATE_8K | AUDIO_SAMP_RATE_11K |
AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K |
AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K |
AUDIO_SAMP_RATE_48K | AUDIO_SAMP_RATE_96K |
AUDIO_SAMP_RATE_128K | AUDIO_SAMP_RATE_160K |
AUDIO_SAMP_RATE_172K | AUDIO_SAMP_RATE_192K;
break;
default:
I2S_IOCTL(i2s, AUDIOIOC_GETCAPS, (unsigned long)caps);
break; break;
} }
break;
default: default:
I2S_IOCTL(i2s, AUDIOIOC_GETCAPS, (unsigned long)caps); I2S_IOCTL(i2s, AUDIOIOC_GETCAPS, (unsigned long)caps);

6
include/nuttx/audio/audio.h
View File

@ -213,6 +213,12 @@
#define AUDIO_SAMP_RATE_160K 0x0400 #define AUDIO_SAMP_RATE_160K 0x0400
#define AUDIO_SAMP_RATE_172K 0x0800 #define AUDIO_SAMP_RATE_172K 0x0800
#define AUDIO_SAMP_RATE_192K 0x1000 #define AUDIO_SAMP_RATE_192K 0x1000
#define AUDIO_SAMP_RATE_DEF_ALL (AUDIO_SAMP_RATE_8K | AUDIO_SAMP_RATE_11K | \
AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K | \
AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K | \
AUDIO_SAMP_RATE_88K | AUDIO_SAMP_RATE_96K | \
AUDIO_SAMP_RATE_128K | AUDIO_SAMP_RATE_160K | \
AUDIO_SAMP_RATE_172K | AUDIO_SAMP_RATE_192K )
/* Audio Sub-sampling Ratios ***********************************************/ /* Audio Sub-sampling Ratios ***********************************************/