|
@@ -260,15 +260,15 @@ unsigned int amdtp_stream_get_max_payload(struct amdtp_stream *s)
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(amdtp_stream_get_max_payload);
|
|
EXPORT_SYMBOL(amdtp_stream_get_max_payload);
|
|
|
|
|
|
-static void amdtp_write_s16(struct amdtp_stream *s,
|
|
|
|
- struct snd_pcm_substream *pcm,
|
|
|
|
- __be32 *buffer, unsigned int frames);
|
|
|
|
-static void amdtp_write_s32(struct amdtp_stream *s,
|
|
|
|
- struct snd_pcm_substream *pcm,
|
|
|
|
- __be32 *buffer, unsigned int frames);
|
|
|
|
-static void amdtp_read_s32(struct amdtp_stream *s,
|
|
|
|
- struct snd_pcm_substream *pcm,
|
|
|
|
- __be32 *buffer, unsigned int frames);
|
|
|
|
|
|
+static void write_pcm_s16(struct amdtp_stream *s,
|
|
|
|
+ struct snd_pcm_substream *pcm,
|
|
|
|
+ __be32 *buffer, unsigned int frames);
|
|
|
|
+static void write_pcm_s32(struct amdtp_stream *s,
|
|
|
|
+ struct snd_pcm_substream *pcm,
|
|
|
|
+ __be32 *buffer, unsigned int frames);
|
|
|
|
+static void read_pcm_s32(struct amdtp_stream *s,
|
|
|
|
+ struct snd_pcm_substream *pcm,
|
|
|
|
+ __be32 *buffer, unsigned int frames);
|
|
|
|
|
|
/**
|
|
/**
|
|
* amdtp_stream_set_pcm_format - set the PCM format
|
|
* amdtp_stream_set_pcm_format - set the PCM format
|
|
@@ -291,16 +291,16 @@ void amdtp_stream_set_pcm_format(struct amdtp_stream *s,
|
|
/* fall through */
|
|
/* fall through */
|
|
case SNDRV_PCM_FORMAT_S16:
|
|
case SNDRV_PCM_FORMAT_S16:
|
|
if (s->direction == AMDTP_OUT_STREAM) {
|
|
if (s->direction == AMDTP_OUT_STREAM) {
|
|
- s->transfer_samples = amdtp_write_s16;
|
|
|
|
|
|
+ s->transfer_samples = write_pcm_s16;
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
WARN_ON(1);
|
|
WARN_ON(1);
|
|
/* fall through */
|
|
/* fall through */
|
|
case SNDRV_PCM_FORMAT_S32:
|
|
case SNDRV_PCM_FORMAT_S32:
|
|
if (s->direction == AMDTP_OUT_STREAM)
|
|
if (s->direction == AMDTP_OUT_STREAM)
|
|
- s->transfer_samples = amdtp_write_s32;
|
|
|
|
|
|
+ s->transfer_samples = write_pcm_s32;
|
|
else
|
|
else
|
|
- s->transfer_samples = amdtp_read_s32;
|
|
|
|
|
|
+ s->transfer_samples = read_pcm_s32;
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -408,9 +408,9 @@ static unsigned int calculate_syt(struct amdtp_stream *s,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-static void amdtp_write_s32(struct amdtp_stream *s,
|
|
|
|
- struct snd_pcm_substream *pcm,
|
|
|
|
- __be32 *buffer, unsigned int frames)
|
|
|
|
|
|
+static void write_pcm_s32(struct amdtp_stream *s,
|
|
|
|
+ struct snd_pcm_substream *pcm,
|
|
|
|
+ __be32 *buffer, unsigned int frames)
|
|
{
|
|
{
|
|
struct snd_pcm_runtime *runtime = pcm->runtime;
|
|
struct snd_pcm_runtime *runtime = pcm->runtime;
|
|
unsigned int channels, remaining_frames, i, c;
|
|
unsigned int channels, remaining_frames, i, c;
|
|
@@ -433,9 +433,9 @@ static void amdtp_write_s32(struct amdtp_stream *s,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-static void amdtp_write_s16(struct amdtp_stream *s,
|
|
|
|
- struct snd_pcm_substream *pcm,
|
|
|
|
- __be32 *buffer, unsigned int frames)
|
|
|
|
|
|
+static void write_pcm_s16(struct amdtp_stream *s,
|
|
|
|
+ struct snd_pcm_substream *pcm,
|
|
|
|
+ __be32 *buffer, unsigned int frames)
|
|
{
|
|
{
|
|
struct snd_pcm_runtime *runtime = pcm->runtime;
|
|
struct snd_pcm_runtime *runtime = pcm->runtime;
|
|
unsigned int channels, remaining_frames, i, c;
|
|
unsigned int channels, remaining_frames, i, c;
|
|
@@ -458,9 +458,9 @@ static void amdtp_write_s16(struct amdtp_stream *s,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-static void amdtp_read_s32(struct amdtp_stream *s,
|
|
|
|
- struct snd_pcm_substream *pcm,
|
|
|
|
- __be32 *buffer, unsigned int frames)
|
|
|
|
|
|
+static void read_pcm_s32(struct amdtp_stream *s,
|
|
|
|
+ struct snd_pcm_substream *pcm,
|
|
|
|
+ __be32 *buffer, unsigned int frames)
|
|
{
|
|
{
|
|
struct snd_pcm_runtime *runtime = pcm->runtime;
|
|
struct snd_pcm_runtime *runtime = pcm->runtime;
|
|
unsigned int channels, remaining_frames, i, c;
|
|
unsigned int channels, remaining_frames, i, c;
|
|
@@ -482,8 +482,8 @@ static void amdtp_read_s32(struct amdtp_stream *s,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-static void amdtp_fill_pcm_silence(struct amdtp_stream *s,
|
|
|
|
- __be32 *buffer, unsigned int frames)
|
|
|
|
|
|
+static void write_pcm_silence(struct amdtp_stream *s,
|
|
|
|
+ __be32 *buffer, unsigned int frames)
|
|
{
|
|
{
|
|
unsigned int i, c;
|
|
unsigned int i, c;
|
|
|
|
|
|
@@ -524,8 +524,8 @@ static void midi_rate_use_one_byte(struct amdtp_stream *s, unsigned int port)
|
|
s->midi_fifo_used[port] += amdtp_rate_table[s->sfc];
|
|
s->midi_fifo_used[port] += amdtp_rate_table[s->sfc];
|
|
}
|
|
}
|
|
|
|
|
|
-static void amdtp_fill_midi(struct amdtp_stream *s,
|
|
|
|
- __be32 *buffer, unsigned int frames)
|
|
|
|
|
|
+static void write_midi_messages(struct amdtp_stream *s,
|
|
|
|
+ __be32 *buffer, unsigned int frames)
|
|
{
|
|
{
|
|
unsigned int f, port;
|
|
unsigned int f, port;
|
|
u8 *b;
|
|
u8 *b;
|
|
@@ -551,8 +551,8 @@ static void amdtp_fill_midi(struct amdtp_stream *s,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-static void amdtp_pull_midi(struct amdtp_stream *s,
|
|
|
|
- __be32 *buffer, unsigned int frames)
|
|
|
|
|
|
+static void read_midi_messages(struct amdtp_stream *s,
|
|
|
|
+ __be32 *buffer, unsigned int frames)
|
|
{
|
|
{
|
|
unsigned int f, port;
|
|
unsigned int f, port;
|
|
int len;
|
|
int len;
|
|
@@ -666,9 +666,9 @@ static int handle_out_packet(struct amdtp_stream *s, unsigned int data_blocks,
|
|
if (pcm)
|
|
if (pcm)
|
|
s->transfer_samples(s, pcm, buffer, data_blocks);
|
|
s->transfer_samples(s, pcm, buffer, data_blocks);
|
|
else
|
|
else
|
|
- amdtp_fill_pcm_silence(s, buffer, data_blocks);
|
|
|
|
|
|
+ write_pcm_silence(s, buffer, data_blocks);
|
|
if (s->midi_ports)
|
|
if (s->midi_ports)
|
|
- amdtp_fill_midi(s, buffer, data_blocks);
|
|
|
|
|
|
+ write_midi_messages(s, buffer, data_blocks);
|
|
|
|
|
|
s->data_block_counter = (s->data_block_counter + data_blocks) & 0xff;
|
|
s->data_block_counter = (s->data_block_counter + data_blocks) & 0xff;
|
|
|
|
|
|
@@ -766,7 +766,7 @@ static int handle_in_packet(struct amdtp_stream *s,
|
|
s->transfer_samples(s, pcm, buffer, data_blocks);
|
|
s->transfer_samples(s, pcm, buffer, data_blocks);
|
|
|
|
|
|
if (s->midi_ports)
|
|
if (s->midi_ports)
|
|
- amdtp_pull_midi(s, buffer, data_blocks);
|
|
|
|
|
|
+ read_midi_messages(s, buffer, data_blocks);
|
|
}
|
|
}
|
|
|
|
|
|
if (s->flags & CIP_DBC_IS_END_EVENT)
|
|
if (s->flags & CIP_DBC_IS_END_EVENT)
|