UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: fsi: add fsi_pointer_update() for common pointer method 

fsi PIO/DMA handler are using each own pointer update method,
but these can be share.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Kuninori Morimoto 2014-06-22 17:55:41 -07:00 committed by Mark Brown
parent ffb83e8cb1
commit d403e24908
1 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
sound/soc/sh/fsi.c
View File

@ -1041,6 +1041,26 @@ static int fsi_clk_set_rate_cpg(struct device *dev,
return ret; return ret;
} }
static void fsi_pointer_update(struct fsi_stream *io, int size)
{
io->buff_sample_pos += size;
if (io->buff_sample_pos >=
io->period_samples * (io->period_pos + 1)) {
struct snd_pcm_substream *substream = io->substream;
struct snd_pcm_runtime *runtime = substream->runtime;
io->period_pos++;
if (io->period_pos >= runtime->periods) {
io->buff_sample_pos = 0;
io->period_pos = 0;
}
snd_pcm_period_elapsed(substream);
}
}
/* /*
* pio data transfer handler * pio data transfer handler
*/ */
@ -1107,31 +1127,11 @@ static int fsi_pio_transfer(struct fsi_priv *fsi, struct fsi_stream *io,
void (*run32)(struct fsi_priv *fsi, u8 *buf, int samples), void (*run32)(struct fsi_priv *fsi, u8 *buf, int samples),
int samples) int samples)
{ {
struct snd_pcm_runtime *runtime;
struct snd_pcm_substream *substream;
u8 *buf; u8 *buf;
int over_period;
if (!fsi_stream_is_working(fsi, io)) if (!fsi_stream_is_working(fsi, io))
return -EINVAL; return -EINVAL;
over_period = 0;
substream = io->substream;
runtime = substream->runtime;
/* FSI FIFO has limit.
* So, this driver can not send periods data at a time
*/
if (io->buff_sample_pos >=
io->period_samples * (io->period_pos + 1)) {
over_period = 1;
io->period_pos = (io->period_pos + 1) % runtime->periods;
if (0 == io->period_pos)
io->buff_sample_pos = 0;
}
buf = fsi_pio_get_area(fsi, io); buf = fsi_pio_get_area(fsi, io);
switch (io->sample_width) { switch (io->sample_width) {
@ -1145,11 +1145,7 @@ static int fsi_pio_transfer(struct fsi_priv *fsi, struct fsi_stream *io,
return -EINVAL; return -EINVAL;
} }
/* update buff_sample_pos */ fsi_pointer_update(io, samples);
io->buff_sample_pos += samples;
if (over_period)
snd_pcm_period_elapsed(substream);
return 0; return 0;
} }
@ -1307,20 +1303,11 @@ static void fsi_dma_complete(void *data)
{ {
struct fsi_stream *io = (struct fsi_stream *)data; struct fsi_stream *io = (struct fsi_stream *)data;
struct fsi_priv *fsi = fsi_stream_to_priv(io); struct fsi_priv *fsi = fsi_stream_to_priv(io);
struct snd_pcm_runtime *runtime = io->substream->runtime;
io->buff_sample_pos += io->period_samples; fsi_pointer_update(io, io->period_samples);
io->period_pos++;
if (io->period_pos >= runtime->periods) {
io->period_pos = 0;
io->buff_sample_pos = 0;
}
fsi_count_fifo_err(fsi); fsi_count_fifo_err(fsi);
fsi_stream_transfer(io); fsi_stream_transfer(io);
snd_pcm_period_elapsed(io->substream);
} }
static void fsi_dma_do_work(struct work_struct *work) static void fsi_dma_do_work(struct work_struct *work)