Commit 9600732b authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

ALSA: core, oxygen, virtuoso: add an enum control info helper 



Introduce the helper function snd_ctl_enum_info() to fill out the
elem_info fields for an enumerated control.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b532d6b8

include/sound/control.h

+3 −1
Original line number Diff line number Diff line
@@ -160,12 +160,14 @@ static inline struct snd_ctl_elem_id *snd_ctl_build_ioff(struct snd_ctl_elem_id 
}



/*

 * Frequently used control callbacks

 * Frequently used control callbacks/helpers

 */

int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,

			      struct snd_ctl_elem_info *uinfo);

int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,

				struct snd_ctl_elem_info *uinfo);

int snd_ctl_enum_info(struct snd_ctl_elem_info *info, unsigned int channels,

		      unsigned int items, const char *const names[]);



/*

 * virtual master control

sound/core/control.c

+27 −1
Original line number Diff line number Diff line
@@ -1488,7 +1488,7 @@ int snd_ctl_create(struct snd_card *card) 
}



/*

 * Frequently used control callbacks

 * Frequently used control callbacks/helpers

 */

int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,

			      struct snd_ctl_elem_info *uinfo)
@@ -1513,3 +1513,29 @@ int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol, 
}



EXPORT_SYMBOL(snd_ctl_boolean_stereo_info);



/**

 * snd_ctl_enum_info - fills the info structure for an enumerated control

 * @info: the structure to be filled

 * @channels: the number of the control's channels; often one

 * @items: the number of control values; also the size of @names

 * @names: an array containing the names of all control values

 *

 * Sets all required fields in @info to their appropriate values.

 * If the control's accessibility is not the default (readable and writable),

 * the caller has to fill @info->access.

 */

int snd_ctl_enum_info(struct snd_ctl_elem_info *info, unsigned int channels,

		      unsigned int items, const char *const names[])

{

	info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	info->count = channels;

	info->value.enumerated.items = items;

	if (info->value.enumerated.item >= items)

		info->value.enumerated.item = items - 1;

	strlcpy(info->value.enumerated.name,

		names[info->value.enumerated.item],

		sizeof(info->value.enumerated.name));

	return 0;

}

EXPORT_SYMBOL(snd_ctl_enum_info);

sound/pci/oxygen/oxygen.c

+2 −14
Original line number Diff line number Diff line
@@ -415,13 +415,7 @@ static int rolloff_info(struct snd_kcontrol *ctl, 
		"Sharp Roll-off", "Slow Roll-off"

	};



	info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	info->count = 1;

	info->value.enumerated.items = 2;

	if (info->value.enumerated.item >= 2)

		info->value.enumerated.item = 1;

	strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);

	return 0;

	return snd_ctl_enum_info(info, 1, 2, names);

}



static int rolloff_get(struct snd_kcontrol *ctl,
@@ -473,13 +467,7 @@ static int hpf_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info) 
		"None", "High-pass Filter"

	};



	info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	info->count = 1;

	info->value.enumerated.items = 2;

	if (info->value.enumerated.item >= 2)

		info->value.enumerated.item = 1;

	strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);

	return 0;

	return snd_ctl_enum_info(info, 1, 2, names);

}



static int hpf_get(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)

sound/pci/oxygen/oxygen_mixer.c

+2 −13
Original line number Diff line number Diff line
@@ -119,13 +119,7 @@ static int upmix_info(struct snd_kcontrol *ctl, struct snd_ctl_elem_info *info) 
	struct oxygen *chip = ctl->private_data;

	unsigned int count = upmix_item_count(chip);



	info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	info->count = 1;

	info->value.enumerated.items = count;

	if (info->value.enumerated.item >= count)

		info->value.enumerated.item = count - 1;

	strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);

	return 0;

	return snd_ctl_enum_info(info, 1, count, names);

}



static int upmix_get(struct snd_kcontrol *ctl, struct snd_ctl_elem_value *value)
@@ -659,12 +653,7 @@ static int mic_fmic_source_info(struct snd_kcontrol *ctl, 
{

	static const char *const names[] = { "Mic Jack", "Front Panel" };



	info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	info->count = 1;

	info->value.enumerated.items = 2;

	info->value.enumerated.item &= 1;

	strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);

	return 0;

	return snd_ctl_enum_info(info, 1, 2, names);

}



static int mic_fmic_source_get(struct snd_kcontrol *ctl,

sound/pci/oxygen/xonar_cs43xx.c

+1 −7
Original line number Diff line number Diff line
@@ -298,13 +298,7 @@ static int rolloff_info(struct snd_kcontrol *ctl, 
		"Fast Roll-off", "Slow Roll-off"

	};



	info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	info->count = 1;

	info->value.enumerated.items = 2;

	if (info->value.enumerated.item >= 2)

		info->value.enumerated.item = 1;

	strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);

	return 0;

	return snd_ctl_enum_info(info, 1, 2, names);

}



static int rolloff_get(struct snd_kcontrol *ctl,