From: linux@audioscience.com
To: tiwai@suse.de
Cc: Eliot Blennerhassett <eblennerhassett@audioscience.com>,
alsa-devel@alsa-project.org
Subject: [PATCH 03/21] Low latency mode stream has fixed channel count.
Date: Thu, 22 Dec 2011 13:38:33 +1300 [thread overview]
Message-ID: <1324514331-22570-4-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>
Unlike other streams which support 1..max channels,
Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
---
sound/pci/asihpi/asihpi.c | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index e9de799..a97a252 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -135,6 +135,8 @@ struct snd_card_asihpi {
u16 update_interval_frames;
u16 in_max_chans;
u16 out_max_chans;
+ u16 in_min_chans;
+ u16 out_min_chans;
};
/* Per stream data */
@@ -968,8 +970,6 @@ static void snd_card_asihpi_playback_format(struct snd_card_asihpi *asihpi,
}
static struct snd_pcm_hardware snd_card_asihpi_playback = {
- .channels_min = 1,
- .channels_max = 2,
.buffer_bytes_max = BUFFER_BYTES_MAX,
.period_bytes_min = PERIOD_BYTES_MIN,
.period_bytes_max = BUFFER_BYTES_MAX / PERIODS_MIN,
@@ -1013,6 +1013,7 @@ static int snd_card_asihpi_playback_open(struct snd_pcm_substream *substream)
runtime->private_free = snd_card_asihpi_runtime_free;
snd_card_asihpi_playback.channels_max = card->out_max_chans;
+ snd_card_asihpi_playback.channels_min = card->out_min_chans;
/*?snd_card_asihpi_playback.period_bytes_min =
card->out_max_chans * 4096; */
@@ -1150,8 +1151,6 @@ static void snd_card_asihpi_capture_format(struct snd_card_asihpi *asihpi,
static struct snd_pcm_hardware snd_card_asihpi_capture = {
- .channels_min = 1,
- .channels_max = 2,
.buffer_bytes_max = BUFFER_BYTES_MAX,
.period_bytes_min = PERIOD_BYTES_MIN,
.period_bytes_max = BUFFER_BYTES_MAX / PERIODS_MIN,
@@ -1193,6 +1192,7 @@ static int snd_card_asihpi_capture_open(struct snd_pcm_substream *substream)
runtime->private_free = snd_card_asihpi_runtime_free;
snd_card_asihpi_capture.channels_max = card->in_max_chans;
+ snd_card_asihpi_capture.channels_min = card->in_min_chans;
snd_card_asihpi_capture_format(card, dpcm->h_stream,
&snd_card_asihpi_capture);
snd_card_asihpi_pcm_samplerates(card, &snd_card_asihpi_capture);
@@ -2883,6 +2883,15 @@ static int __devinit snd_asihpi_probe(struct pci_dev *pci_dev,
asihpi->out_max_chans = 2;
}
+ if (asihpi->out_max_chans > 2) { /* assume LL mode */
+ asihpi->out_min_chans = asihpi->out_max_chans;
+ asihpi->in_min_chans = asihpi->in_max_chans;
+ asihpi->support_grouping = 0;
+ } else {
+ asihpi->out_min_chans = 1;
+ asihpi->in_min_chans = 1;
+ }
+
snd_printk(KERN_INFO "has dma:%d, grouping:%d, mrx:%d\n",
asihpi->can_dma,
asihpi->support_grouping,
--
1.7.0.4
next prev 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 ` linux [this message]
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 ` [PATCH 20/21] Use valid channel count in format enumeration linux
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-4-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.