diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-25 11:27:29 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-25 11:27:29 -0600 |
| commit | f107733608516b43452be2a428d7da6e94fdd5a6 (patch) | |
| tree | 585d30d4f15b127ed8bcec001cd3f3fe621d2c36 /nuttx/drivers/audio | |
| parent | cf5cf56cb94f6299a38a8d1765723e82b2afc5bf (diff) | |
| download | nuttx-f107733608516b43452be2a428d7da6e94fdd5a6.tar.gz nuttx-f107733608516b43452be2a428d7da6e94fdd5a6.tar.bz2 nuttx-f107733608516b43452be2a428d7da6e94fdd5a6.zip | |
Audio: Fix some compilation issues introduced with some of the recent changes
Diffstat (limited to 'nuttx/drivers/audio')
| -rw-r--r-- | nuttx/drivers/audio/audio_null.c | 3 | ||||
| -rw-r--r-- | nuttx/drivers/audio/vs1053.c | 10 | ||||
| -rw-r--r-- | nuttx/drivers/audio/wm8904.c | 9 |
3 files changed, 12 insertions, 10 deletions
diff --git a/nuttx/drivers/audio/audio_null.c b/nuttx/drivers/audio/audio_null.c index f599f0972..526e8d204 100644 --- a/nuttx/drivers/audio/audio_null.c +++ b/nuttx/drivers/audio/audio_null.c @@ -583,6 +583,9 @@ static int null_stop(FAR struct audio_lowerhalf_s *dev) FAR void *value; /* Send a message to stop all audio streaming */ + /* REVISIT: There should be a check to see if the worker thread is still + * running. + */ term_msg.msgId = AUDIO_MSG_STOP; term_msg.u.data = 0; diff --git a/nuttx/drivers/audio/vs1053.c b/nuttx/drivers/audio/vs1053.c index 26c2aae41..d06d3881c 100644 --- a/nuttx/drivers/audio/vs1053.c +++ b/nuttx/drivers/audio/vs1053.c @@ -647,9 +647,9 @@ static int vs1053_getcaps(FAR struct audio_lowerhalf_s *lower, int type, /* Report the Sample rates we support */ pCaps->ac_controls.b[0] = 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_16K | AUDIO_SAMP_RATE_22K | + AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K | + AUDIO_SAMP_RATE_48K; break; case AUDIO_FMT_MP3: @@ -779,7 +779,7 @@ static int vs1053_configure(FAR struct audio_lowerhalf_s *lower, case AUDIO_FU_VOLUME: /* Set the volume */ - dev->volume = pCaps->ac_controls.hw[0]); + dev->volume = pCaps->ac_controls.hw[0]; vs1053_setvolume(dev); break; @@ -789,7 +789,7 @@ static int vs1053_configure(FAR struct audio_lowerhalf_s *lower, case AUDIO_FU_BALANCE: /* Set the volume */ - dev->balance = pCaps->ac_controls.hw[0]); + dev->balance = pCaps->ac_controls.hw[0]; vs1053_setvolume(dev); break; diff --git a/nuttx/drivers/audio/wm8904.c b/nuttx/drivers/audio/wm8904.c index 952708f10..c3e4514fe 100644 --- a/nuttx/drivers/audio/wm8904.c +++ b/nuttx/drivers/audio/wm8904.c @@ -563,8 +563,7 @@ static int wm8904_getcaps(FAR struct audio_lowerhalf_s *dev, int type, /* Fill in the caller's structure based on requested info */ - caps->ac_format[0] = 0; - caps->ac_format[1] = 0; + caps->ac_format.hw = 0; caps->ac_controls.w = 0; switch (caps->ac_type) @@ -619,9 +618,9 @@ static int wm8904_getcaps(FAR struct audio_lowerhalf_s *dev, int type, /* Report the Sample rates we support */ caps->ac_controls.b[0] = 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_16K | AUDIO_SAMP_RATE_22K | + AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K | + AUDIO_SAMP_RATE_48K; break; case AUDIO_FMT_MP3: |