aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/rme9652
diff options
context:
space:
mode:
authorAdrian Knoth <adi@drcomp.erfurt.thur.de>2013-07-05 05:28:08 -0400
committerTakashi Iwai <tiwai@suse.de>2013-07-05 08:51:57 -0400
commitdb2d1a913d838ecfab5b903508bcdd4e4ad42419 (patch)
tree0f19a8d85b99aafb87fe565593408c4c6aadb746 /sound/pci/rme9652
parent3c32de58ae9a3d534ba1a66274bf43631e36eb5c (diff)
ALSA: hdspm - AES32: Add TCO and Sync-In text entries
Provide the text for the two new clock options "TCO" and "Sync In" on AES32 cards. Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/rme9652')
-rw-r--r--sound/pci/rme9652/hdspm.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index d1e05828cee6..8e6ce1473333 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -561,10 +561,13 @@ static char *hdspm_speed_names[] = { "single", "double", "quad" };
561static char *texts_autosync_aes_tco[] = { "Word Clock", 561static char *texts_autosync_aes_tco[] = { "Word Clock",
562 "AES1", "AES2", "AES3", "AES4", 562 "AES1", "AES2", "AES3", "AES4",
563 "AES5", "AES6", "AES7", "AES8", 563 "AES5", "AES6", "AES7", "AES8",
564 "TCO" }; 564 "TCO", "Sync In"
565};
565static char *texts_autosync_aes[] = { "Word Clock", 566static char *texts_autosync_aes[] = { "Word Clock",
566 "AES1", "AES2", "AES3", "AES4", 567 "AES1", "AES2", "AES3", "AES4",
567 "AES5", "AES6", "AES7", "AES8" }; 568 "AES5", "AES6", "AES7", "AES8",
569 "Sync In"
570};
568static char *texts_autosync_madi_tco[] = { "Word Clock", 571static char *texts_autosync_madi_tco[] = { "Word Clock",
569 "MADI", "TCO", "Sync In" }; 572 "MADI", "TCO", "Sync In" };
570static char *texts_autosync_madi[] = { "Word Clock", 573static char *texts_autosync_madi[] = { "Word Clock",
@@ -2941,11 +2944,11 @@ static int snd_hdspm_info_autosync_ref(struct snd_kcontrol *kcontrol,
2941 2944
2942 if (AES32 == hdspm->io_type) { 2945 if (AES32 == hdspm->io_type) {
2943 static char *texts[] = { "WordClock", "AES1", "AES2", "AES3", 2946 static char *texts[] = { "WordClock", "AES1", "AES2", "AES3",
2944 "AES4", "AES5", "AES6", "AES7", "AES8", "None"}; 2947 "AES4", "AES5", "AES6", "AES7", "AES8", "TCO", "Sync In", "None"};
2945 2948
2946 uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; 2949 uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
2947 uinfo->count = 1; 2950 uinfo->count = 1;
2948 uinfo->value.enumerated.items = 10; 2951 uinfo->value.enumerated.items = ARRAY_SIZE(texts);
2949 if (uinfo->value.enumerated.item >= 2952 if (uinfo->value.enumerated.item >=
2950 uinfo->value.enumerated.items) 2953 uinfo->value.enumerated.items)
2951 uinfo->value.enumerated.item = 2954 uinfo->value.enumerated.item =