Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04659f9e authored by Adrian Knoth's avatar Adrian Knoth Committed by Takashi Iwai
Browse files

ALSA: hdspm - Use snd_ctl_enum_info() in snd_hdspm_info_autosync_ref 



Also use snd_ctl_enum_info() to fill the autosync text fields on AES32
and MADI cards (only users of snd_hdspm_info_autosync_ref).

Signed-off-by: default avatarAdrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent eb0d4dbf

sound/pci/rme9652/hdspm.c

+4 −20
Original line number Original line Diff line number Diff line
@@ -2983,31 +2983,15 @@ static int snd_hdspm_info_autosync_ref(struct snd_kcontrol *kcontrol, 
	struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);

	struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);





	if (AES32 == hdspm->io_type) {

	if (AES32 == hdspm->io_type) {

		static char *texts[] = { "WordClock", "AES1", "AES2", "AES3",

		static const char *const texts[] = { "WordClock", "AES1", "AES2", "AES3",

			"AES4",	"AES5", "AES6", "AES7", "AES8", "TCO", "Sync In", "None"};

			"AES4",	"AES5", "AES6", "AES7", "AES8", "TCO", "Sync In", "None"};





		uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

		ENUMERATED_CTL_INFO(uinfo, texts);

		uinfo->count = 1;

		uinfo->value.enumerated.items = ARRAY_SIZE(texts);

		if (uinfo->value.enumerated.item >=

		    uinfo->value.enumerated.items)

			uinfo->value.enumerated.item =

				uinfo->value.enumerated.items - 1;

		strcpy(uinfo->value.enumerated.name,

				texts[uinfo->value.enumerated.item]);

	} else if (MADI == hdspm->io_type) {

	} else if (MADI == hdspm->io_type) {

		static char *texts[] = {"Word Clock", "MADI", "TCO",

		static const char *const texts[] = {"Word Clock", "MADI", "TCO",

			"Sync In", "None" };

			"Sync In", "None" };





		uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

		ENUMERATED_CTL_INFO(uinfo, texts);

		uinfo->count = 1;

		uinfo->value.enumerated.items = 5;

		if (uinfo->value.enumerated.item >=

				uinfo->value.enumerated.items)

			uinfo->value.enumerated.item =

				uinfo->value.enumerated.items - 1;

		strcpy(uinfo->value.enumerated.name,

				texts[uinfo->value.enumerated.item]);

	}

	}

	return 0;

	return 0;

}

}