aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAdrian Knoth <adi@drcomp.erfurt.thur.de>2012-10-19 11:42:26 -0400
committerTakashi Iwai <tiwai@suse.de>2012-10-20 04:43:05 -0400
commitb8812c55c5e59596bbf4b1d3e5b4b3ef50a89cad (patch)
tree295cbf5b52ca19fd6b923e7615eeff2a9204ea16 /sound
parentd681deaa74748ce1d4b1a862438c955b70f46690 (diff)
ALSA: hdspm - Also report autosync_sample_rate on MADI and MADIface
MADI and MADIface used to report the autosync_sample_rate. This functionality was lost in commit 0dca1793063c28dde8f6c49c9c72203fe5cb6efc, this commit now adds it back. Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/rme9652/hdspm.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 976e3a6b0508..5f243aedeef7 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -2225,6 +2225,21 @@ static int snd_hdspm_get_autosync_sample_rate(struct snd_kcontrol *kcontrol,
2225 break; 2225 break;
2226 } 2226 }
2227 break; 2227 break;
2228
2229 case MADI:
2230 case MADIface:
2231 {
2232 int rate = hdspm_external_sample_rate(hdspm);
2233 int i, selected_rate = 0;
2234 for (i = 1; i < 10; i++)
2235 if (HDSPM_bit2freq(i) == rate) {
2236 selected_rate = i;
2237 break;
2238 }
2239 ucontrol->value.enumerated.item[0] = selected_rate;
2240 }
2241 break;
2242
2228 default: 2243 default:
2229 break; 2244 break;
2230 } 2245 }
@@ -4450,6 +4465,7 @@ static struct snd_kcontrol_new snd_hdspm_controls_madi[] = {
4450 HDSPM_PREF_SYNC_REF("Preferred Sync Reference", 0), 4465 HDSPM_PREF_SYNC_REF("Preferred Sync Reference", 0),
4451 HDSPM_AUTOSYNC_REF("AutoSync Reference", 0), 4466 HDSPM_AUTOSYNC_REF("AutoSync Reference", 0),
4452 HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0), 4467 HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),
4468 HDSPM_AUTOSYNC_SAMPLE_RATE("External Rate", 0),
4453 HDSPM_SYNC_CHECK("WC SyncCheck", 0), 4469 HDSPM_SYNC_CHECK("WC SyncCheck", 0),
4454 HDSPM_SYNC_CHECK("MADI SyncCheck", 1), 4470 HDSPM_SYNC_CHECK("MADI SyncCheck", 1),
4455 HDSPM_SYNC_CHECK("TCO SyncCHeck", 2), 4471 HDSPM_SYNC_CHECK("TCO SyncCHeck", 2),