Commit 55799c5a authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire: arrange common PCM info/constraints for AMDTP engine applications 



In ALSA firewire stack, 8 drivers uses IEC 61883-1/6 engine for data
transmission. They have common PCM info/constraints and duplicated codes.

This commit unifies the codes into fireiwre-lib.

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

sound/firewire/amdtp-stream.c

+19 −0
Original line number Diff line number Diff line
@@ -148,8 +148,27 @@ EXPORT_SYMBOL(amdtp_rate_table); 
int amdtp_stream_add_pcm_hw_constraints(struct amdtp_stream *s,

					struct snd_pcm_runtime *runtime)

{

	struct snd_pcm_hardware *hw = &runtime->hw;

	int err;



	hw->info = SNDRV_PCM_INFO_BATCH |

		   SNDRV_PCM_INFO_BLOCK_TRANSFER |

		   SNDRV_PCM_INFO_INTERLEAVED |

		   SNDRV_PCM_INFO_JOINT_DUPLEX |

		   SNDRV_PCM_INFO_MMAP |

		   SNDRV_PCM_INFO_MMAP_VALID;



	/* SNDRV_PCM_INFO_BATCH */

	hw->periods_min = 2;

	hw->periods_max = UINT_MAX;



	/* bytes for a frame */

	hw->period_bytes_min = 4 * hw->channels_max;



	/* Just to prevent from allocating much pages. */

	hw->period_bytes_max = hw->period_bytes_min * 2048;

	hw->buffer_bytes_max = hw->period_bytes_max * hw->periods_min;



	/*

	 * Currently firewire-lib processes 16 packets in one software

	 * interrupt callback. This equals to 2msec but actually the

sound/firewire/bebob/bebob_pcm.c

+0 −21
Original line number Diff line number Diff line
@@ -92,19 +92,6 @@ limit_channels_and_rates(struct snd_pcm_hardware *hw, 
	}

}



static void

limit_period_and_buffer(struct snd_pcm_hardware *hw)

{

	hw->periods_min = 2;		/* SNDRV_PCM_INFO_BATCH */

	hw->periods_max = UINT_MAX;



	hw->period_bytes_min = 4 * hw->channels_max;	/* bytes for a frame */



	/* Just to prevent from allocating much pages. */

	hw->period_bytes_max = hw->period_bytes_min * 2048;

	hw->buffer_bytes_max = hw->period_bytes_max * hw->periods_min;

}



static int

pcm_init_hw_params(struct snd_bebob *bebob,

		   struct snd_pcm_substream *substream)
@@ -114,13 +101,6 @@ pcm_init_hw_params(struct snd_bebob *bebob, 
	struct snd_bebob_stream_formation *formations;

	int err;



	runtime->hw.info = SNDRV_PCM_INFO_BATCH |

			   SNDRV_PCM_INFO_BLOCK_TRANSFER |

			   SNDRV_PCM_INFO_INTERLEAVED |

			   SNDRV_PCM_INFO_JOINT_DUPLEX |

			   SNDRV_PCM_INFO_MMAP |

			   SNDRV_PCM_INFO_MMAP_VALID;



	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

		runtime->hw.formats = AM824_IN_PCM_FORMAT_BITS;

		s = &bebob->tx_stream;
@@ -132,7 +112,6 @@ pcm_init_hw_params(struct snd_bebob *bebob, 
	}



	limit_channels_and_rates(&runtime->hw, formations);

	limit_period_and_buffer(&runtime->hw);



	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,

				  hw_rule_channels, formations,

sound/firewire/dice/dice-pcm.c

+0 −20
Original line number Diff line number Diff line
@@ -51,18 +51,6 @@ static int limit_channels_and_rates(struct snd_dice *dice, 
	return 0;

}



static void limit_period_and_buffer(struct snd_pcm_hardware *hw)

{

	hw->periods_min = 2;			/* SNDRV_PCM_INFO_BATCH */

	hw->periods_max = UINT_MAX;



	hw->period_bytes_min = 4 * hw->channels_max;    /* byte for a frame */



	/* Just to prevent from allocating much pages. */

	hw->period_bytes_max = hw->period_bytes_min * 2048;

	hw->buffer_bytes_max = hw->period_bytes_max * hw->periods_min;

}



static int init_hw_info(struct snd_dice *dice,

			struct snd_pcm_substream *substream)

{
@@ -74,13 +62,6 @@ static int init_hw_info(struct snd_dice *dice, 
	unsigned int count, size;

	int err;



	hw->info = SNDRV_PCM_INFO_MMAP |

		   SNDRV_PCM_INFO_MMAP_VALID |

		   SNDRV_PCM_INFO_BATCH |

		   SNDRV_PCM_INFO_INTERLEAVED |

		   SNDRV_PCM_INFO_JOINT_DUPLEX |

		   SNDRV_PCM_INFO_BLOCK_TRANSFER;



	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

		hw->formats = AM824_IN_PCM_FORMAT_BITS;

		dir = AMDTP_IN_STREAM;
@@ -107,7 +88,6 @@ static int init_hw_info(struct snd_dice *dice, 
				       substream->pcm->device, size);

	if (err < 0)

		return err;

	limit_period_and_buffer(hw);



	return amdtp_am824_add_pcm_hw_constraints(stream, runtime);

}

sound/firewire/digi00x/digi00x-pcm.c

+11 −22
Original line number Diff line number Diff line
@@ -58,31 +58,11 @@ static int hw_rule_channels(struct snd_pcm_hw_params *params, 
static int pcm_init_hw_params(struct snd_dg00x *dg00x,

			      struct snd_pcm_substream *substream)

{

	static const struct snd_pcm_hardware hardware = {

		.info = SNDRV_PCM_INFO_BATCH |

			SNDRV_PCM_INFO_BLOCK_TRANSFER |

			SNDRV_PCM_INFO_INTERLEAVED |

			SNDRV_PCM_INFO_JOINT_DUPLEX |

			SNDRV_PCM_INFO_MMAP |

			SNDRV_PCM_INFO_MMAP_VALID,

		.rates = SNDRV_PCM_RATE_44100 |

			 SNDRV_PCM_RATE_48000 |

			 SNDRV_PCM_RATE_88200 |

			 SNDRV_PCM_RATE_96000,

		.rate_min = 44100,

		.rate_max = 96000,

		.channels_min = 10,

		.channels_max = 18,

		.period_bytes_min = 4 * 18,

		.period_bytes_max = 4 * 18 * 2048,

		.buffer_bytes_max = 4 * 18 * 2048 * 2,

		.periods_min = 2,

		.periods_max = UINT_MAX,

	};

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_pcm_hardware *hw = &runtime->hw;

	struct amdtp_stream *s;

	int err;



	substream->runtime->hw = hardware;



	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

		substream->runtime->hw.formats = SNDRV_PCM_FMTBIT_S32;
@@ -92,6 +72,15 @@ static int pcm_init_hw_params(struct snd_dg00x *dg00x, 
		s = &dg00x->rx_stream;

	}



	hw->channels_min = 10;

	hw->channels_max = 18;



	hw->rates = SNDRV_PCM_RATE_44100 |

		    SNDRV_PCM_RATE_48000 |

		    SNDRV_PCM_RATE_88200 |

		    SNDRV_PCM_RATE_96000;

	snd_pcm_limit_hw_rates(runtime);



	err = snd_pcm_hw_rule_add(substream->runtime, 0,

				  SNDRV_PCM_HW_PARAM_CHANNELS,

				  hw_rule_channels, NULL,

sound/firewire/fireface/ff-pcm.c

+0 −21
Original line number Diff line number Diff line
@@ -91,18 +91,6 @@ static void limit_channels_and_rates(struct snd_pcm_hardware *hw, 
	}

}



static void limit_period_and_buffer(struct snd_pcm_hardware *hw)

{

	hw->periods_min = 2;		/* SNDRV_PCM_INFO_BATCH */

	hw->periods_max = UINT_MAX;



	hw->period_bytes_min = 4 * hw->channels_max;	/* bytes for a frame */



	/* Just to prevent from allocating much pages. */

	hw->period_bytes_max = hw->period_bytes_min * 2048;

	hw->buffer_bytes_max = hw->period_bytes_max * hw->periods_min;

}



static int pcm_init_hw_params(struct snd_ff *ff,

			      struct snd_pcm_substream *substream)

{
@@ -111,13 +99,6 @@ static int pcm_init_hw_params(struct snd_ff *ff, 
	const unsigned int *pcm_channels;

	int err;



	runtime->hw.info = SNDRV_PCM_INFO_BATCH |

			   SNDRV_PCM_INFO_BLOCK_TRANSFER |

			   SNDRV_PCM_INFO_INTERLEAVED |

			   SNDRV_PCM_INFO_JOINT_DUPLEX |

			   SNDRV_PCM_INFO_MMAP |

			   SNDRV_PCM_INFO_MMAP_VALID;



	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

		runtime->hw.formats = SNDRV_PCM_FMTBIT_S32;

		s = &ff->tx_stream;
@@ -128,9 +109,7 @@ static int pcm_init_hw_params(struct snd_ff *ff, 
		pcm_channels = ff->spec->pcm_playback_channels;

	}



	/* limit rates */

	limit_channels_and_rates(&runtime->hw, pcm_channels);

	limit_period_and_buffer(&runtime->hw);



	err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,

				  hw_rule_channels, (void *)pcm_channels,

CRA Git | Maintained and supported by SUSTech CRA and CCSE