Commit b96c3a15 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: es1938: Convert to the new PCM copy ops

Replace the copy ops with the new copy_user and copy_kernel ops.
It's used only for a capture stream (for some hardware workaround),
thus we need no silence operation.
Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d53611d2
...@@ -839,15 +839,12 @@ static snd_pcm_uframes_t snd_es1938_playback_pointer(struct snd_pcm_substream *s ...@@ -839,15 +839,12 @@ static snd_pcm_uframes_t snd_es1938_playback_pointer(struct snd_pcm_substream *s
} }
static int snd_es1938_capture_copy(struct snd_pcm_substream *substream, static int snd_es1938_capture_copy(struct snd_pcm_substream *substream,
int channel, int channel, unsigned long pos,
snd_pcm_uframes_t pos, void __user *dst, unsigned long count)
void __user *dst,
snd_pcm_uframes_t count)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct es1938 *chip = snd_pcm_substream_chip(substream); struct es1938 *chip = snd_pcm_substream_chip(substream);
pos <<= chip->dma1_shift;
count <<= chip->dma1_shift;
if (snd_BUG_ON(pos + count > chip->dma1_size)) if (snd_BUG_ON(pos + count > chip->dma1_size))
return -EINVAL; return -EINVAL;
if (pos + count < chip->dma1_size) { if (pos + count < chip->dma1_size) {
...@@ -856,12 +853,31 @@ static int snd_es1938_capture_copy(struct snd_pcm_substream *substream, ...@@ -856,12 +853,31 @@ static int snd_es1938_capture_copy(struct snd_pcm_substream *substream,
} else { } else {
if (copy_to_user(dst, runtime->dma_area + pos + 1, count - 1)) if (copy_to_user(dst, runtime->dma_area + pos + 1, count - 1))
return -EFAULT; return -EFAULT;
if (put_user(runtime->dma_area[0], ((unsigned char __user *)dst) + count - 1)) if (put_user(runtime->dma_area[0],
((unsigned char __user *)dst) + count - 1))
return -EFAULT; return -EFAULT;
} }
return 0; return 0;
} }
static int snd_es1938_capture_copy_kernel(struct snd_pcm_substream *substream,
int channel, unsigned long pos,
void *dst, unsigned long count)
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct es1938 *chip = snd_pcm_substream_chip(substream);
if (snd_BUG_ON(pos + count > chip->dma1_size))
return -EINVAL;
if (pos + count < chip->dma1_size) {
memcpy(dst, runtime->dma_area + pos + 1, count);
} else {
memcpy(dst, runtime->dma_area + pos + 1, count - 1);
runtime->dma_area[0] = *((unsigned char *)dst + count - 1);
}
return 0;
}
/* /*
* buffer management * buffer management
*/ */
...@@ -1012,7 +1028,8 @@ static const struct snd_pcm_ops snd_es1938_capture_ops = { ...@@ -1012,7 +1028,8 @@ static const struct snd_pcm_ops snd_es1938_capture_ops = {
.prepare = snd_es1938_capture_prepare, .prepare = snd_es1938_capture_prepare,
.trigger = snd_es1938_capture_trigger, .trigger = snd_es1938_capture_trigger,
.pointer = snd_es1938_capture_pointer, .pointer = snd_es1938_capture_pointer,
.copy = snd_es1938_capture_copy, .copy_user = snd_es1938_capture_copy,
.copy_kernel = snd_es1938_capture_copy_kernel,
}; };
static int snd_es1938_new_pcm(struct es1938 *chip, int device) static int snd_es1938_new_pcm(struct es1938 *chip, int device)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment