Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 377b6f62 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: core: soc level wrapper for pcm_pointer callback 



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: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 50831450

sound/soc/soc-core.c

+18 −1
Original line number Diff line number Diff line
@@ -800,6 +800,23 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd) 
	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 */

static struct snd_pcm_ops soc_pcm_ops = {

	.open		= soc_pcm_open,
@@ -808,6 +825,7 @@ static struct snd_pcm_ops soc_pcm_ops = { 
	.hw_free	= soc_pcm_hw_free,

	.prepare	= soc_pcm_prepare,

	.trigger	= soc_pcm_trigger,

	.pointer	= soc_pcm_pointer,

};



#ifdef CONFIG_PM
@@ -1328,7 +1346,6 @@ static int soc_new_pcm(struct snd_soc_device *socdev, 
	dai_link->pcm = pcm;

	pcm->private_data = rtd;

	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.copy = platform->pcm_ops->copy;

	soc_pcm_ops.silence = platform->pcm_ops->silence;