Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: linux@audioscience.com
To: tiwai@suse.de
Cc: Eliot Blennerhassett <eblennerhassett@audioscience.com>,
	alsa-devel@alsa-project.org
Subject: [PATCH 20/21] Use valid channel count in format enumeration.
Date: Thu, 22 Dec 2011 13:38:50 +1300	[thread overview]
Message-ID: <1324514331-22570-21-git-send-email-linux@audioscience.com> (raw)
In-Reply-To: <1324514331-22570-1-git-send-email-linux@audioscience.com>

From: Eliot Blennerhassett <eblennerhassett@audioscience.com>

Since introduction of mono and low latency modes, fixed channel count of 2
is not always valid.  Use reported max_channels instead.

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
---
 sound/pci/asihpi/asihpi.c |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index ab7bc94..4aa8336 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -961,14 +961,12 @@ static void snd_card_asihpi_playback_format(struct snd_card_asihpi *asihpi,
 
 	for (format = HPI_FORMAT_PCM8_UNSIGNED;
 	     format <= HPI_FORMAT_PCM24_SIGNED; format++) {
-		err = hpi_format_create(&hpi_format,
-					2, format, sample_rate, 128000, 0);
+		err = hpi_format_create(&hpi_format, asihpi->out_max_chans,
+					format, sample_rate, 128000, 0);
 		if (!err)
-			err = hpi_outstream_query_format(h_stream,
-							&hpi_format);
+			err = hpi_outstream_query_format(h_stream, &hpi_format);
 		if (!err && (hpi_to_alsa_formats[format] != -1))
-			pcmhw->formats |=
-				(1ULL << hpi_to_alsa_formats[format]);
+			pcmhw->formats |= (1ULL << hpi_to_alsa_formats[format]);
 	}
 }
 
@@ -1141,14 +1139,12 @@ static void snd_card_asihpi_capture_format(struct snd_card_asihpi *asihpi,
 	for (format = HPI_FORMAT_PCM8_UNSIGNED;
 		format <= HPI_FORMAT_PCM24_SIGNED; format++) {
 
-		err = hpi_format_create(&hpi_format, 2, format,
-				sample_rate, 128000, 0);
+		err = hpi_format_create(&hpi_format, asihpi->in_max_chans,
+					format, sample_rate, 128000, 0);
 		if (!err)
-			err = hpi_instream_query_format(h_stream,
-					    &hpi_format);
+			err = hpi_instream_query_format(h_stream, &hpi_format);
 		if (!err)
-			pcmhw->formats |=
-				(1ULL << hpi_to_alsa_formats[format]);
+			pcmhw->formats |= (1ULL << hpi_to_alsa_formats[format]);
 	}
 }
 
-- 
1.7.0.4

  parent reply	other threads:[~2011-12-22  0:40 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-22  0:38 [PATCH 00/21] ALSA: asihpi - update to 4.10 linux
2011-12-22  0:38 ` [PATCH 01/21] Split hpi version info into separate header file linux
2011-12-22  0:38 ` [PATCH 02/21] Update copyright to 2011 linux
2011-12-22  0:38 ` [PATCH 03/21] Low latency mode stream has fixed channel count linux
2011-12-22  0:38 ` [PATCH 04/21] Volumes and meters may have 1 or 2 channels linux
2011-12-22  0:38 ` [PATCH 05/21] Use snd_pcm_debug_name to get substream name linux
2011-12-22  0:38 ` [PATCH 06/21] Correct stray capital letters in identifier linux
2011-12-22  0:38 ` [PATCH 07/21] Relax drained check for more reliable playback startup linux
2011-12-22  0:38 ` [PATCH 08/21] Only set sync if card supports hardware stream grouping linux
2011-12-22  0:38 ` [PATCH 09/21] Update node types linux
2011-12-22  0:38 ` [PATCH 10/21] Remove unused structs and defs linux
2011-12-22  0:38 ` [PATCH 11/21] Add new function codes linux
2011-12-22  0:38 ` [PATCH 12/21] Increase debug response buffer size linux
2011-12-22  0:38 ` [PATCH 13/21] Remove redundant struct members linux
2011-12-22  0:38 ` [PATCH 14/21] Simplify dsp code close linux
2011-12-22  0:38 ` [PATCH 15/21] Add autofade query linux
2011-12-22  0:38 ` [PATCH 16/21] New defs and comments linux
2011-12-22  0:38 ` [PATCH 17/21] Distinguish four different emif init errors linux
2011-12-22  0:38 ` [PATCH 18/21] Add HPI version to module description linux
2011-12-22  0:38 ` [PATCH 19/21] Correct headers in cached control responses linux
2011-12-22  0:38 ` linux [this message]
2011-12-22  0:38 ` [PATCH 21/21] Fix format validity check linux
2011-12-22  7:15 ` [PATCH 00/21] ALSA: asihpi - update to 4.10 Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1324514331-22570-21-git-send-email-linux@audioscience.com \
    --to=linux@audioscience.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=eblennerhassett@audioscience.com \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox