commit 3839e4f136d6da3dc85d237aa9569ee94bfea763
author Takashi Iwai <tiwai@suse.de> Fri Dec 21 16:33:32 2007 +0100
committer Mercurial server <hg@alsa0.alsa-project.org> Thu Jan 31 17:30:24 2008 +0100
tree c000a5a87e22c22890c24b8eb4f1fee861bbd79a
parent 88aa139057f2740c5dd55e2a542b2425186e4d3c

[ALSA] emu10k1 - Use enum for emu_model types

Use enum instead of digits for emu_model types.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

sound/pci/emu10k1/emumixer.c

diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index 7ebf035..fd22120 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -397,7 +397,7 @@
 
 	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
 	uinfo->count = 1;
-	if (emu->card_capabilities->emu_model == 3) { /* 1616(m) cardbus */
+	if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616) {
 		uinfo->value.enumerated.items = 49;
 		items = emu1616_src_texts;
 	} else {
@@ -421,7 +421,8 @@
 	channel = (kcontrol->private_value) & 0xff;
 	/* Limit: emu1010_output_dst, emu->emu1010.output_source */
 	if (channel >= 24 ||
-	    (emu->card_capabilities->emu_model == 3 && channel >= 18))
+	    (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
+	     channel >= 18))
 		return -EINVAL;
 	ucontrol->value.enumerated.item[0] = emu->emu1010.output_source[channel];
 	return 0;
@@ -436,17 +437,19 @@
 
 	val = ucontrol->value.enumerated.item[0];
 	if (val >= 53 ||
-	    (emu->card_capabilities->emu_model == 3 && val >= 49))
+	    (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
+	     val >= 49))
 		return -EINVAL;
 	channel = (kcontrol->private_value) & 0xff;
 	/* Limit: emu1010_output_dst, emu->emu1010.output_source */
 	if (channel >= 24 ||
-	    (emu->card_capabilities->emu_model == 3 && channel >= 18))
+	    (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
+	     channel >= 18))
 		return -EINVAL;
 	if (emu->emu1010.output_source[channel] == val)
 		return 0;
 	emu->emu1010.output_source[channel] = val;
-	if (emu->card_capabilities->emu_model == 3) /* 1616(m) cardbus */
+	if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616)
 		snd_emu1010_fpga_link_dst_src_write(emu,
 			emu1616_output_dst[channel], emu1616_src_regs[val]);
 	else
@@ -478,7 +481,8 @@
 
 	val = ucontrol->value.enumerated.item[0];
 	if (val >= 53 ||
-	    (emu->card_capabilities->emu_model == 3 && val >= 49))
+	    (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
+	     val >= 49))
 		return -EINVAL;
 	channel = (kcontrol->private_value) & 0xff;
 	/* Limit: emu1010_input_dst, emu->emu1010.input_source */
@@ -487,7 +491,7 @@
 	if (emu->emu1010.input_source[channel] == val)
 		return 0;
 	emu->emu1010.input_source[channel] = val;
-	if (emu->card_capabilities->emu_model == 3) /* 1616(m) cardbus */
+	if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616)
 		snd_emu1010_fpga_link_dst_src_write(emu,
 			emu1010_input_dst[channel], emu1616_src_regs[val]);
 	else
@@ -1991,7 +1995,7 @@
 			return err;
 	}
 
-	if (emu->card_capabilities->emu_model == 3) {
+	if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616) {
 		/* 1616(m) cardbus */
 		int i;