diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-07 09:54:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-07 09:54:41 +0200 |
| commit | 7445c995b06f2a999541ccf127886d24a2a7d012 (patch) | |
| tree | 940cb9cce2e2e3dcbbe3502bf720fd10481769af /include/sound | |
| parent | 1172234cbe94658c16bc83e50ca57b5a47085209 (diff) | |
| parent | 5f712b2b73a9fc87fcc52124cfe8adefaa0c92f5 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dai.h | 18 | ||||
| -rw-r--r-- | include/sound/soc.h | 1 |
2 files changed, 18 insertions, 1 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 061f16d4c87..0a0b019d41a 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -219,7 +219,6 @@ struct snd_soc_dai { struct snd_soc_codec *codec; unsigned int active; unsigned char pop_wait:1; - void *dma_data; /* DAI private data */ void *private_data; @@ -230,4 +229,21 @@ struct snd_soc_dai { struct list_head list; }; +static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai, + const struct snd_pcm_substream *ss) +{ + return (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) ? + dai->playback.dma_data : dai->capture.dma_data; +} + +static inline void snd_soc_dai_set_dma_data(struct snd_soc_dai *dai, + const struct snd_pcm_substream *ss, + void *data) +{ + if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) + dai->playback.dma_data = data; + else + dai->capture.dma_data = data; +} + #endif diff --git a/include/sound/soc.h b/include/sound/soc.h index 5d234a8c250..a57fbfcd4c8 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -375,6 +375,7 @@ struct snd_soc_pcm_stream { unsigned int channels_min; /* min channels */ unsigned int channels_max; /* max channels */ unsigned int active:1; /* stream is in use */ + void *dma_data; /* used by platform code */ }; /* SoC audio ops */ |