Commit 9fc90644 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-lib: code refactoring for AM824 data block processing layer 



This is code refactoring for AM824 data block processing layer so that
it can receive list of packet descriptor.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d2c104a3

sound/firewire/amdtp-am824.c

+30 −21
Original line number Diff line number Diff line
@@ -146,19 +146,24 @@ void amdtp_am824_set_midi_position(struct amdtp_stream *s, 
}

EXPORT_SYMBOL_GPL(amdtp_am824_set_midi_position);



static void write_pcm_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,

			  unsigned int pcm_frames)

{

	struct amdtp_am824 *p = s->protocol;

	unsigned int channels = p->pcm_channels;

	struct snd_pcm_runtime *runtime = pcm->runtime;

	unsigned int channels, remaining_frames, i, c;

	unsigned int pcm_buffer_pointer;

	int remaining_frames;

	const u32 *src;

	int i, c;



	pcm_buffer_pointer = s->pcm_buffer_pointer + pcm_frames;

	pcm_buffer_pointer %= runtime->buffer_size;



	channels = p->pcm_channels;

	src = (void *)runtime->dma_area +

			frames_to_bytes(runtime, s->pcm_buffer_pointer);

	remaining_frames = runtime->buffer_size - s->pcm_buffer_pointer;

				frames_to_bytes(runtime, pcm_buffer_pointer);

	remaining_frames = runtime->buffer_size - pcm_buffer_pointer;



	for (i = 0; i < frames; ++i) {

		for (c = 0; c < channels; ++c) {
@@ -172,19 +177,24 @@ static void write_pcm_s32(struct amdtp_stream *s, 
	}

}



static void read_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,

			 unsigned int pcm_frames)

{

	struct amdtp_am824 *p = s->protocol;

	unsigned int channels = p->pcm_channels;

	struct snd_pcm_runtime *runtime = pcm->runtime;

	unsigned int channels, remaining_frames, i, c;

	unsigned int pcm_buffer_pointer;

	int remaining_frames;

	u32 *dst;

	int i, c;



	pcm_buffer_pointer = s->pcm_buffer_pointer + pcm_frames;

	pcm_buffer_pointer %= runtime->buffer_size;



	channels = p->pcm_channels;

	dst  = (void *)runtime->dma_area +

			frames_to_bytes(runtime, s->pcm_buffer_pointer);

	remaining_frames = runtime->buffer_size - s->pcm_buffer_pointer;

				frames_to_bytes(runtime, pcm_buffer_pointer);

	remaining_frames = runtime->buffer_size - pcm_buffer_pointer;



	for (i = 0; i < frames; ++i) {

		for (c = 0; c < channels; ++c) {
@@ -340,14 +350,14 @@ static unsigned int process_rx_data_blocks(struct amdtp_stream *s, 
					   struct snd_pcm_substream *pcm)

{

	struct amdtp_am824 *p = s->protocol;

	unsigned int pcm_frames;

	unsigned int pcm_frames = 0;



	if (pcm) {

		write_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks);

		write_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks,

			      pcm_frames);

		pcm_frames = desc->data_blocks * p->frame_multiplier;

	} else {

		write_pcm_silence(s, desc->ctx_payload, desc->data_blocks);

		pcm_frames = 0;

	}



	if (p->midi_ports) {
@@ -363,13 +373,12 @@ static unsigned int process_tx_data_blocks(struct amdtp_stream *s, 
					   struct snd_pcm_substream *pcm)

{

	struct amdtp_am824 *p = s->protocol;

	unsigned int pcm_frames;

	unsigned int pcm_frames = 0;



	if (pcm) {

		read_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks);

		read_pcm_s32(s, pcm, desc->ctx_payload, desc->data_blocks,

			     pcm_frames);

		pcm_frames = desc->data_blocks * p->frame_multiplier;

	} else {

		pcm_frames = 0;

	}



	if (p->midi_ports) {