redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ALSA: hdspm - Report external rate in slave mode on PCI MADI

Browse source 
As a follow-up to a97bda7d29, report the
external sample rate as system_sample_rate when in slave mode.

For PCIe MADI cards, the DDS value automatically contains the external
sample rate, but the PCI version needs this manual workaround.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Adrian Knoth 2012-10-19 17:42:23 +02:00 committed by Takashi Iwai
parent 41285a98f8
commit 21a164df0c
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sound/pci/rme9652/hdspm.c
View file

@ -971,6 +971,7 @@ static inline void snd_hdspm_initialize_midi_flush(struct hdspm *hdspm);
static int hdspm_update_simple_mixer_controls(struct hdspm *hdspm); static int hdspm_update_simple_mixer_controls(struct hdspm *hdspm);
static int hdspm_autosync_ref(struct hdspm *hdspm); static int hdspm_autosync_ref(struct hdspm *hdspm);
static int snd_hdspm_set_defaults(struct hdspm *hdspm); static int snd_hdspm_set_defaults(struct hdspm *hdspm);
static int hdspm_system_clock_mode(struct hdspm *hdspm);
static void hdspm_set_sgbuf(struct hdspm *hdspm, static void hdspm_set_sgbuf(struct hdspm *hdspm,
struct snd_pcm_substream *substream, struct snd_pcm_substream *substream,
unsigned int reg, int channels); unsigned int reg, int channels);
@ -1989,10 +1990,14 @@ static int hdspm_get_system_sample_rate(struct hdspm *hdspm)
rate = hdspm_calc_dds_value(hdspm, period); rate = hdspm_calc_dds_value(hdspm, period);
if (rate > 207000) { if (rate > 207000) {
/* Unreasonable high sample rate as seen on PCI MADI cards. /* Unreasonable high sample rate as seen on PCI MADI cards. */
* Use the cached value instead. if (0 == hdspm_system_clock_mode(hdspm)) {
*/ /* master mode, return internal sample rate */
rate = hdspm->system_sample_rate; rate = hdspm->system_sample_rate;
} else {
/* slave mode, return external sample rate */
rate = hdspm_external_sample_rate(hdspm);
}
} }
return rate; return rate;