From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 2/5] sound: pci: ctxfi: ctatc.c: added reference to card
Date: Sun, 21 Sep 2014 21:33:38 +0530 [thread overview]
Message-ID: <1411315421-24138-2-git-send-email-sudipm.mukherjee@gmail.com> (raw)
In-Reply-To: <1411315421-24138-1-git-send-email-sudipm.mukherjee@gmail.com>
added reference of the card in the convert_format function
so that we can know which card has called the function
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
sound/pci/ctxfi/ctatc.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index b21eda4..3e29e13 100644
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -171,7 +171,8 @@ static unsigned long atc_get_ptp_phys(struct ct_atc *atc, int index)
return atc->vm->get_ptp_phys(atc->vm, index);
}
-static unsigned int convert_format(snd_pcm_format_t snd_format)
+static unsigned int convert_format(snd_pcm_format_t snd_format,
+ struct snd_card *card)
{
switch (snd_format) {
case SNDRV_PCM_FORMAT_U8:
@@ -268,7 +269,8 @@ static int atc_pcm_playback_prepare(struct ct_atc *atc, struct ct_atc_pcm *apcm)
src = apcm->src;
src->ops->set_pitch(src, pitch);
src->ops->set_rom(src, select_rom(pitch));
- src->ops->set_sf(src, convert_format(apcm->substream->runtime->format));
+ src->ops->set_sf(src, convert_format(apcm->substream->runtime->format,
+ atc->card));
src->ops->set_pm(src, (src->ops->next_interleave(src) != NULL));
/* Get AMIXER resource */
@@ -738,7 +740,8 @@ static int atc_pcm_capture_start(struct ct_atc *atc, struct ct_atc_pcm *apcm)
/* Set up recording SRC */
src = apcm->src;
- src->ops->set_sf(src, convert_format(apcm->substream->runtime->format));
+ src->ops->set_sf(src, convert_format(apcm->substream->runtime->format,
+ atc->card));
src->ops->set_sa(src, apcm->vm_block->addr);
src->ops->set_la(src, apcm->vm_block->addr + apcm->vm_block->size);
src->ops->set_ca(src, apcm->vm_block->addr);
@@ -807,7 +810,8 @@ static int spdif_passthru_playback_get_resources(struct ct_atc *atc,
src = apcm->src;
src->ops->set_pitch(src, pitch);
src->ops->set_rom(src, select_rom(pitch));
- src->ops->set_sf(src, convert_format(apcm->substream->runtime->format));
+ src->ops->set_sf(src, convert_format(apcm->substream->runtime->format,
+ atc->card));
src->ops->set_pm(src, (src->ops->next_interleave(src) != NULL));
src->ops->set_bp(src, 1);
--
1.8.1.2
next prev parent reply other threads:[~2014-09-21 16:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-21 16:03 [PATCH v3 1/5] sound: pci: ctxfi: added reference of snd_card Sudip Mukherjee
2014-09-21 16:03 ` Sudip Mukherjee [this message]
2014-09-21 16:03 ` [PATCH v3 3/5] sound: pci: ctxfi: pr_* replaced with dev_* Sudip Mukherjee
2014-09-22 7:08 ` Takashi Iwai
2014-09-22 8:08 ` Sudip Mukherjee
2014-09-21 16:03 ` [PATCH v3 4/5] sound: pci: ctxfi: cthw20k2.c: sparse warning of incorrect type Sudip Mukherjee
2014-09-22 7:10 ` Takashi Iwai
2014-09-22 8:09 ` Sudip Mukherjee
2014-09-21 16:03 ` [PATCH v3 5/5] sound: pci: ctxfi: cthw20k1.c: " Sudip Mukherjee
2014-09-22 7:04 ` [PATCH v3 1/5] sound: pci: ctxfi: added reference of snd_card Takashi Iwai
2014-09-22 8:15 ` Sudip Mukherjee
2014-09-22 8:21 ` Takashi Iwai
2014-09-22 8:46 ` Sudip Mukherjee
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=1411315421-24138-2-git-send-email-sudipm.mukherjee@gmail.com \
--to=sudipm.mukherjee@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--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;
as well as URLs for NNTP newsgroup(s).