Commit 7b6ae34d authored by Takashi Iwai's avatar Takashi Iwai

ALSA: rme9652: Convert to the new PCM ops

Replace the copy and the silence ops with the new PCM ops.
The conversion is straightforward with standard helper functions.
Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 53945f5b
...@@ -1883,13 +1883,14 @@ static char *rme9652_channel_buffer_location(struct snd_rme9652 *rme9652, ...@@ -1883,13 +1883,14 @@ static char *rme9652_channel_buffer_location(struct snd_rme9652 *rme9652,
} }
} }
static int snd_rme9652_playback_copy(struct snd_pcm_substream *substream, int channel, static int snd_rme9652_playback_copy(struct snd_pcm_substream *substream,
snd_pcm_uframes_t pos, void __user *src, snd_pcm_uframes_t count) int channel, unsigned long pos,
void __user *src, unsigned long count)
{ {
struct snd_rme9652 *rme9652 = snd_pcm_substream_chip(substream); struct snd_rme9652 *rme9652 = snd_pcm_substream_chip(substream);
char *channel_buf; char *channel_buf;
if (snd_BUG_ON(pos + count > RME9652_CHANNEL_BUFFER_BYTES / 4)) if (snd_BUG_ON(pos + count > RME9652_CHANNEL_BUFFER_BYTES))
return -EINVAL; return -EINVAL;
channel_buf = rme9652_channel_buffer_location (rme9652, channel_buf = rme9652_channel_buffer_location (rme9652,
...@@ -1897,18 +1898,35 @@ static int snd_rme9652_playback_copy(struct snd_pcm_substream *substream, int ch ...@@ -1897,18 +1898,35 @@ static int snd_rme9652_playback_copy(struct snd_pcm_substream *substream, int ch
channel); channel);
if (snd_BUG_ON(!channel_buf)) if (snd_BUG_ON(!channel_buf))
return -EIO; return -EIO;
if (copy_from_user(channel_buf + pos * 4, src, count * 4)) if (copy_from_user(channel_buf + pos, src, count))
return -EFAULT; return -EFAULT;
return count; return 0;
} }
static int snd_rme9652_capture_copy(struct snd_pcm_substream *substream, int channel, static int snd_rme9652_playback_copy_kernel(struct snd_pcm_substream *substream,
snd_pcm_uframes_t pos, void __user *dst, snd_pcm_uframes_t count) int channel, unsigned long pos,
void *src, unsigned long count)
{ {
struct snd_rme9652 *rme9652 = snd_pcm_substream_chip(substream); struct snd_rme9652 *rme9652 = snd_pcm_substream_chip(substream);
char *channel_buf; char *channel_buf;
if (snd_BUG_ON(pos + count > RME9652_CHANNEL_BUFFER_BYTES / 4)) channel_buf = rme9652_channel_buffer_location(rme9652,
substream->pstr->stream,
channel);
if (snd_BUG_ON(!channel_buf))
return -EIO;
memcpy(channel_buf + pos, src, count);
return 0;
}
static int snd_rme9652_capture_copy(struct snd_pcm_substream *substream,
int channel, unsigned long pos,
void __user *dst, unsigned long count)
{
struct snd_rme9652 *rme9652 = snd_pcm_substream_chip(substream);
char *channel_buf;
if (snd_BUG_ON(pos + count > RME9652_CHANNEL_BUFFER_BYTES))
return -EINVAL; return -EINVAL;
channel_buf = rme9652_channel_buffer_location (rme9652, channel_buf = rme9652_channel_buffer_location (rme9652,
...@@ -1916,13 +1934,30 @@ static int snd_rme9652_capture_copy(struct snd_pcm_substream *substream, int cha ...@@ -1916,13 +1934,30 @@ static int snd_rme9652_capture_copy(struct snd_pcm_substream *substream, int cha
channel); channel);
if (snd_BUG_ON(!channel_buf)) if (snd_BUG_ON(!channel_buf))
return -EIO; return -EIO;
if (copy_to_user(dst, channel_buf + pos * 4, count * 4)) if (copy_to_user(dst, channel_buf + pos, count))
return -EFAULT; return -EFAULT;
return count; return 0;
} }
static int snd_rme9652_hw_silence(struct snd_pcm_substream *substream, int channel, static int snd_rme9652_capture_copy_kernel(struct snd_pcm_substream *substream,
snd_pcm_uframes_t pos, snd_pcm_uframes_t count) int channel, unsigned long pos,
void *dst, unsigned long count)
{
struct snd_rme9652 *rme9652 = snd_pcm_substream_chip(substream);
char *channel_buf;
channel_buf = rme9652_channel_buffer_location(rme9652,
substream->pstr->stream,
channel);
if (snd_BUG_ON(!channel_buf))
return -EIO;
memcpy(dst, channel_buf + pos, count);
return 0;
}
static int snd_rme9652_hw_silence(struct snd_pcm_substream *substream,
int channel, unsigned long pos,
unsigned long count)
{ {
struct snd_rme9652 *rme9652 = snd_pcm_substream_chip(substream); struct snd_rme9652 *rme9652 = snd_pcm_substream_chip(substream);
char *channel_buf; char *channel_buf;
...@@ -1932,8 +1967,8 @@ static int snd_rme9652_hw_silence(struct snd_pcm_substream *substream, int chann ...@@ -1932,8 +1967,8 @@ static int snd_rme9652_hw_silence(struct snd_pcm_substream *substream, int chann
channel); channel);
if (snd_BUG_ON(!channel_buf)) if (snd_BUG_ON(!channel_buf))
return -EIO; return -EIO;
memset(channel_buf + pos * 4, 0, count * 4); memset(channel_buf + pos, 0, count);
return count; return 0;
} }
static int snd_rme9652_reset(struct snd_pcm_substream *substream) static int snd_rme9652_reset(struct snd_pcm_substream *substream)
...@@ -2376,8 +2411,9 @@ static const struct snd_pcm_ops snd_rme9652_playback_ops = { ...@@ -2376,8 +2411,9 @@ static const struct snd_pcm_ops snd_rme9652_playback_ops = {
.prepare = snd_rme9652_prepare, .prepare = snd_rme9652_prepare,
.trigger = snd_rme9652_trigger, .trigger = snd_rme9652_trigger,
.pointer = snd_rme9652_hw_pointer, .pointer = snd_rme9652_hw_pointer,
.copy = snd_rme9652_playback_copy, .copy_user = snd_rme9652_playback_copy,
.silence = snd_rme9652_hw_silence, .copy_kernel = snd_rme9652_playback_copy_kernel,
.fill_silence = snd_rme9652_hw_silence,
}; };
static const struct snd_pcm_ops snd_rme9652_capture_ops = { static const struct snd_pcm_ops snd_rme9652_capture_ops = {
...@@ -2388,7 +2424,8 @@ static const struct snd_pcm_ops snd_rme9652_capture_ops = { ...@@ -2388,7 +2424,8 @@ static const struct snd_pcm_ops snd_rme9652_capture_ops = {
.prepare = snd_rme9652_prepare, .prepare = snd_rme9652_prepare,
.trigger = snd_rme9652_trigger, .trigger = snd_rme9652_trigger,
.pointer = snd_rme9652_hw_pointer, .pointer = snd_rme9652_hw_pointer,
.copy = snd_rme9652_capture_copy, .copy_user = snd_rme9652_capture_copy,
.copy_kernel = snd_rme9652_capture_copy_kernel,
}; };
static int snd_rme9652_create_pcm(struct snd_card *card, static int snd_rme9652_create_pcm(struct snd_card *card,
......
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