iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: core: soc level wrapper for pcm_pointer callback

Browse Source 
Create a soc level wrapper for pcm_pointer callback.
This will facilitate the soc level handling of different
HW buffers in the audio path.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Peter Ujfalusi 2010-03-03 15:08:06 +02:00 committed by Mark Brown
parent 5083145050
commit 377b6f62ef
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sound/soc/soc-core.c
View File

@ -800,6 +800,23 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
return 0; return 0;
} }
/*
* soc level wrapper for pointer callback
*/
static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_device *socdev = rtd->socdev;
struct snd_soc_card *card = socdev->card;
struct snd_soc_platform *platform = card->platform;
snd_pcm_uframes_t offset = 0;
if (platform->pcm_ops->pointer)
offset = platform->pcm_ops->pointer(substream);
return offset;
}
/* ASoC PCM operations */ /* ASoC PCM operations */
static struct snd_pcm_ops soc_pcm_ops = { static struct snd_pcm_ops soc_pcm_ops = {
.open = soc_pcm_open, .open = soc_pcm_open,
@ -808,6 +825,7 @@ static struct snd_pcm_ops soc_pcm_ops = {
.hw_free = soc_pcm_hw_free, .hw_free = soc_pcm_hw_free,
.prepare = soc_pcm_prepare, .prepare = soc_pcm_prepare,
.trigger = soc_pcm_trigger, .trigger = soc_pcm_trigger,
.pointer = soc_pcm_pointer,
}; };
#ifdef CONFIG_PM #ifdef CONFIG_PM
@ -1328,7 +1346,6 @@ static int soc_new_pcm(struct snd_soc_device *socdev,
dai_link->pcm = pcm; dai_link->pcm = pcm;
pcm->private_data = rtd; pcm->private_data = rtd;
soc_pcm_ops.mmap = platform->pcm_ops->mmap; soc_pcm_ops.mmap = platform->pcm_ops->mmap;
soc_pcm_ops.pointer = platform->pcm_ops->pointer;
soc_pcm_ops.ioctl = platform->pcm_ops->ioctl; soc_pcm_ops.ioctl = platform->pcm_ops->ioctl;
soc_pcm_ops.copy = platform->pcm_ops->copy; soc_pcm_ops.copy = platform->pcm_ops->copy;
soc_pcm_ops.silence = platform->pcm_ops->silence; soc_pcm_ops.silence = platform->pcm_ops->silence;