Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 2008f137 authored Apr 28, 2009 by Takashi Iwai

ALSA: Add missing SNDRV_PCM_INFO_BATCH flag to some drivers



Added SNDRV_PCM_INFO_BATCH flag to PCM info field of some drivers that
really don't give the precise pointer value.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 27b18332

sound/isa/msnd/msnd.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -438,7 +438,8 @@ static void snd_msnd_capture_reset_queue(struct snd_msnd *chip,
	static struct snd_pcm_hardware snd_msnd_playback = {		static struct snd_pcm_hardware snd_msnd_playback = {
	.info = SNDRV_PCM_INFO_MMAP \|		.info = SNDRV_PCM_INFO_MMAP \|
	SNDRV_PCM_INFO_INTERLEAVED \|		SNDRV_PCM_INFO_INTERLEAVED \|
	SNDRV_PCM_INFO_MMAP_VALID,		SNDRV_PCM_INFO_MMAP_VALID \|
			SNDRV_PCM_INFO_BATCH,
	.formats = SNDRV_PCM_FMTBIT_U8 \| SNDRV_PCM_FMTBIT_S16_LE,		.formats = SNDRV_PCM_FMTBIT_U8 \| SNDRV_PCM_FMTBIT_S16_LE,
	.rates = SNDRV_PCM_RATE_8000_48000,		.rates = SNDRV_PCM_RATE_8000_48000,
	.rate_min = 8000,		.rate_min = 8000,
	@@ -456,7 +457,8 @@ static struct snd_pcm_hardware snd_msnd_playback = {
	static struct snd_pcm_hardware snd_msnd_capture = {		static struct snd_pcm_hardware snd_msnd_capture = {
	.info = SNDRV_PCM_INFO_MMAP \|		.info = SNDRV_PCM_INFO_MMAP \|
	SNDRV_PCM_INFO_INTERLEAVED \|		SNDRV_PCM_INFO_INTERLEAVED \|
	SNDRV_PCM_INFO_MMAP_VALID,		SNDRV_PCM_INFO_MMAP_VALID \|
			SNDRV_PCM_INFO_BATCH,
	.formats = SNDRV_PCM_FMTBIT_U8 \| SNDRV_PCM_FMTBIT_S16_LE,		.formats = SNDRV_PCM_FMTBIT_U8 \| SNDRV_PCM_FMTBIT_S16_LE,
	.rates = SNDRV_PCM_RATE_8000_48000,		.rates = SNDRV_PCM_RATE_8000_48000,
	.rate_min = 8000,		.rate_min = 8000,

sound/pci/bt87x.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -349,7 +349,8 @@ static struct snd_pcm_hardware snd_bt87x_digital_hw = {
	.info = SNDRV_PCM_INFO_MMAP \|		.info = SNDRV_PCM_INFO_MMAP \|
	SNDRV_PCM_INFO_INTERLEAVED \|		SNDRV_PCM_INFO_INTERLEAVED \|
	SNDRV_PCM_INFO_BLOCK_TRANSFER \|		SNDRV_PCM_INFO_BLOCK_TRANSFER \|
	SNDRV_PCM_INFO_MMAP_VALID,		SNDRV_PCM_INFO_MMAP_VALID \|
			SNDRV_PCM_INFO_BATCH,
	.formats = SNDRV_PCM_FMTBIT_S16_LE,		.formats = SNDRV_PCM_FMTBIT_S16_LE,
	.rates = 0, /* set at runtime */		.rates = 0, /* set at runtime */
	.channels_min = 2,		.channels_min = 2,
	@@ -365,7 +366,8 @@ static struct snd_pcm_hardware snd_bt87x_analog_hw = {
	.info = SNDRV_PCM_INFO_MMAP \|		.info = SNDRV_PCM_INFO_MMAP \|
	SNDRV_PCM_INFO_INTERLEAVED \|		SNDRV_PCM_INFO_INTERLEAVED \|
	SNDRV_PCM_INFO_BLOCK_TRANSFER \|		SNDRV_PCM_INFO_BLOCK_TRANSFER \|
	SNDRV_PCM_INFO_MMAP_VALID,		SNDRV_PCM_INFO_MMAP_VALID \|
			SNDRV_PCM_INFO_BATCH,
	.formats = SNDRV_PCM_FMTBIT_S16_LE \| SNDRV_PCM_FMTBIT_S8,		.formats = SNDRV_PCM_FMTBIT_S16_LE \| SNDRV_PCM_FMTBIT_S8,
	.rates = SNDRV_PCM_RATE_KNOT,		.rates = SNDRV_PCM_RATE_KNOT,
	.rate_min = ANALOG_CLOCK / CLOCK_DIV_MAX,		.rate_min = ANALOG_CLOCK / CLOCK_DIV_MAX,

sound/pci/korg1212/korg1212.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1238,7 +1238,8 @@ static struct snd_pcm_hardware snd_korg1212_playback_info =
	{		{
	.info = (SNDRV_PCM_INFO_MMAP \|		.info = (SNDRV_PCM_INFO_MMAP \|
	SNDRV_PCM_INFO_MMAP_VALID \|		SNDRV_PCM_INFO_MMAP_VALID \|
	SNDRV_PCM_INFO_INTERLEAVED),		SNDRV_PCM_INFO_INTERLEAVED \|
			SNDRV_PCM_INFO_BATCH),
	.formats = SNDRV_PCM_FMTBIT_S16_LE,		.formats = SNDRV_PCM_FMTBIT_S16_LE,
	.rates = (SNDRV_PCM_RATE_44100 \|		.rates = (SNDRV_PCM_RATE_44100 \|
	SNDRV_PCM_RATE_48000),		SNDRV_PCM_RATE_48000),
	@@ -1258,7 +1259,8 @@ static struct snd_pcm_hardware snd_korg1212_capture_info =
	{		{
	.info = (SNDRV_PCM_INFO_MMAP \|		.info = (SNDRV_PCM_INFO_MMAP \|
	SNDRV_PCM_INFO_MMAP_VALID \|		SNDRV_PCM_INFO_MMAP_VALID \|
	SNDRV_PCM_INFO_INTERLEAVED),		SNDRV_PCM_INFO_INTERLEAVED \|
			SNDRV_PCM_INFO_BATCH),
	.formats = SNDRV_PCM_FMTBIT_S16_LE,		.formats = SNDRV_PCM_FMTBIT_S16_LE,
	.rates = (SNDRV_PCM_RATE_44100 \|		.rates = (SNDRV_PCM_RATE_44100 \|
	SNDRV_PCM_RATE_48000),		SNDRV_PCM_RATE_48000),

sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -240,7 +240,8 @@ static int pdacf_pcm_prepare(struct snd_pcm_substream *subs)
	static struct snd_pcm_hardware pdacf_pcm_capture_hw = {		static struct snd_pcm_hardware pdacf_pcm_capture_hw = {
	.info = (SNDRV_PCM_INFO_MMAP \| SNDRV_PCM_INFO_INTERLEAVED \|		.info = (SNDRV_PCM_INFO_MMAP \| SNDRV_PCM_INFO_INTERLEAVED \|
	SNDRV_PCM_INFO_PAUSE \| SNDRV_PCM_INFO_RESUME \|		SNDRV_PCM_INFO_PAUSE \| SNDRV_PCM_INFO_RESUME \|
	SNDRV_PCM_INFO_MMAP_VALID),		SNDRV_PCM_INFO_MMAP_VALID \|
			SNDRV_PCM_INFO_BATCH),
	.formats = SNDRV_PCM_FMTBIT_S16_LE \| SNDRV_PCM_FMTBIT_S16_BE \|		.formats = SNDRV_PCM_FMTBIT_S16_LE \| SNDRV_PCM_FMTBIT_S16_BE \|
	SNDRV_PCM_FMTBIT_S24_3LE \| SNDRV_PCM_FMTBIT_S24_3BE \|		SNDRV_PCM_FMTBIT_S24_3LE \| SNDRV_PCM_FMTBIT_S24_3BE \|
	SNDRV_PCM_FMTBIT_S32_LE \| SNDRV_PCM_FMTBIT_S32_BE,		SNDRV_PCM_FMTBIT_S32_LE \| SNDRV_PCM_FMTBIT_S32_BE,

sound/soc/au1x/dbdma2.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -82,7 +82,7 @@ static struct au1xpsc_audio_dmadata *au1xpsc_audio_pcmdma[2];
	/* PCM hardware DMA capabilities - platform specific */		/* PCM hardware DMA capabilities - platform specific */
	static const struct snd_pcm_hardware au1xpsc_pcm_hardware = {		static const struct snd_pcm_hardware au1xpsc_pcm_hardware = {
	.info = SNDRV_PCM_INFO_MMAP \| SNDRV_PCM_INFO_MMAP_VALID \|		.info = SNDRV_PCM_INFO_MMAP \| SNDRV_PCM_INFO_MMAP_VALID \|
	SNDRV_PCM_INFO_INTERLEAVED,		SNDRV_PCM_INFO_INTERLEAVED \| SNDRV_PCM_INFO_BATCH,
	.formats = AU1XPSC_PCM_FMTS,		.formats = AU1XPSC_PCM_FMTS,
	.period_bytes_min = AU1XPSC_PERIOD_MIN_BYTES,		.period_bytes_min = AU1XPSC_PERIOD_MIN_BYTES,
	.period_bytes_max = 4096 * 1024 - 1,		.period_bytes_max = 4096 * 1024 - 1,