diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-24 10:21:04 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-24 10:21:04 -0600 |
| commit | 9ae823595a6f77cd55ed91a2dd23d152a5e385c4 (patch) | |
| tree | 1b9245f74c51d387e5d5d795d5ad71888175a7be /nuttx/audio | |
| parent | 9ee5cdfd37157507a9b40d4554b407037b6e2c77 (diff) | |
| download | px4-nuttx-9ae823595a6f77cd55ed91a2dd23d152a5e385c4.tar.gz px4-nuttx-9ae823595a6f77cd55ed91a2dd23d152a5e385c4.tar.bz2 px4-nuttx-9ae823595a6f77cd55ed91a2dd23d152a5e385c4.zip | |
Convert ac_format and ac_controls to unions to make access a little cleaner
Diffstat (limited to 'nuttx/audio')
| -rw-r--r-- | nuttx/audio/pcm_decode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/audio/pcm_decode.c b/nuttx/audio/pcm_decode.c index 45937fd12..6b46f770b 100644 --- a/nuttx/audio/pcm_decode.c +++ b/nuttx/audio/pcm_decode.c @@ -407,7 +407,7 @@ static int pcm_getcaps(FAR struct audio_lowerhalf_s *dev, int type, if (caps->ac_subtype == AUDIO_TYPE_QUERY) { - *((uint16_t *)&caps->ac_format[0]) = (1 << (AUDIO_FMT_PCM - 1)); + caps->ac_format.hw = (1 << (AUDIO_FMT_PCM - 1)); } return caps->ac_len; @@ -749,12 +749,12 @@ static int pcm_enqueuebuffer(FAR struct audio_lowerhalf_s *dev, DEBUGASSERT(priv->samprate < 65535); - caps.ac_len = sizeof(struct audio_caps_s); - caps.ac_type = AUDIO_TYPE_OUTPUT; - caps.ac_channels = priv->nchannels; + caps.ac_len = sizeof(struct audio_caps_s); + caps.ac_type = AUDIO_TYPE_OUTPUT; + caps.ac_channels = priv->nchannels; - *((uint16_t *)&caps.ac_controls[0]) = (uint16_t)priv->samprate; - caps.ac_controls[2] = priv->bpsamp; + caps.ac_controls.hw[0] = (uint16_t)priv->samprate; + caps.ac_controls.b[2] = priv->bpsamp; #ifdef CONFIG_AUDIO_MULTI_SESSION ret = lower->ops->configure(lower, priv->session, &caps); |