Re: [Alsa-user] ice1712/envy24 + alsa: no analog devices- next try

[Takashi Iwai <tiwai@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

(forwarded to alsa-devel now, too)

At 07 Feb 2003 23:39:04 +0100,
Olaf Giesbrecht wrote:
> 
> >  the content of
> > /proc/asound/card0/ice1712 would help much, too.
> > 
> 
> 
> ICE1712
> 
> EEPROM:
>   Subvendor        : 0x3b152511

oh, then it's a new model.  seems not supported yet.

are you sure that it's an EWS88MT?
if your card is really compatible with the old EWS88MT, the attached
patch should work.


Takashi

[-- Attachment #2: ice-test.dif --]
[-- Type: application/octet-stream, Size: 2967 bytes --]

Index: alsa-kernel/pci/ice1712/ews.c
===================================================================
RCS file: /suse/tiwai/cvs/alsa/alsa-kernel/pci/ice1712/ews.c,v
retrieving revision 1.10
diff -u -r1.10 ews.c
--- alsa-kernel/pci/ice1712/ews.c	31 Jan 2003 15:08:13 -0000	1.10
+++ alsa-kernel/pci/ice1712/ews.c	10 Feb 2003 09:48:31 -0000
@@ -221,6 +221,7 @@
 	snd_i2c_lock(ice->i2c);
 	switch (ice->eeprom.subvendor) {
 	case ICE1712_SUBDEVICE_EWS88MT:
+	case ICE1712_SUBDEVICE_EWS88MT_NEW:
 		snd_runtime_check(snd_i2c_sendbytes(ice->cs8404, &bits, 1) == 1, goto _error);
 		break;
 	case ICE1712_SUBDEVICE_EWS88D:
@@ -332,6 +333,7 @@
 		ice->num_total_dacs = 2;
 		break;	
 	case ICE1712_SUBDEVICE_EWS88MT:
+	case ICE1712_SUBDEVICE_EWS88MT_NEW:
 		ice->num_total_dacs = 8;
 		break;
 	case ICE1712_SUBDEVICE_EWS88D:
@@ -358,6 +360,7 @@
 		}
 		break;
 	case ICE1712_SUBDEVICE_EWS88MT:
+	case ICE1712_SUBDEVICE_EWS88MT_NEW:
 		if ((err = snd_i2c_device_create(ice->i2c, "CS8404", ICE1712_EWS88MT_CS8404_ADDR, &ice->cs8404)) < 0)
 			return err;
 		if ((err = snd_i2c_device_create(ice->i2c, "PCF8574 (1st)", ICE1712_EWS88MT_INPUT_ADDR, &ice->i2cdevs[0])) < 0)
@@ -386,6 +389,7 @@
 			return err;
 #endif
 	case ICE1712_SUBDEVICE_EWS88MT:
+	case ICE1712_SUBDEVICE_EWS88MT_NEW:
 	case ICE1712_SUBDEVICE_EWS88D:
 		/* set up CS8404 */
 		ice->spdif.ops.open = ews88_open_spdif;
@@ -403,6 +407,7 @@
 	ak = &ice->ak4524;
 	switch (ice->eeprom.subvendor) {
 	case ICE1712_SUBDEVICE_EWS88MT:
+	case ICE1712_SUBDEVICE_EWS88MT_NEW:
 		ak->num_adcs = ak->num_dacs = 8;
 		ak->type = SND_AK4524;
 		ak->caddr = 2;
@@ -864,6 +869,7 @@
 	switch (ice->eeprom.subvendor) {
 	case ICE1712_SUBDEVICE_EWX2496:
 	case ICE1712_SUBDEVICE_EWS88MT:
+	case ICE1712_SUBDEVICE_EWS88MT_NEW:
 	case ICE1712_SUBDEVICE_DMX6FIRE:
 		err = snd_ice1712_ak4524_build_controls(ice);
 		if (err < 0)
@@ -881,6 +887,7 @@
 		}
 		break;
 	case ICE1712_SUBDEVICE_EWS88MT:
+	case ICE1712_SUBDEVICE_EWS88MT_NEW:
 		for (idx = 0; idx < 8; idx++) {
 			kctl = snd_ctl_new1(&snd_ice1712_ews88mt_input_sense, ice);
 			kctl->id.index = idx;
@@ -922,6 +929,12 @@
 	{
 		ICE1712_SUBDEVICE_EWS88MT,
 		"TerraTec EWS 88MT",
+		snd_ice1712_ews_init,
+		snd_ice1712_ews_add_controls,
+	},
+	{
+		ICE1712_SUBDEVICE_EWS88MT_NEW,
+		"TerraTec EWS 88MT (new)",
 		snd_ice1712_ews_init,
 		snd_ice1712_ews_add_controls,
 	},
Index: alsa-kernel/pci/ice1712/ews.h
===================================================================
RCS file: /suse/tiwai/cvs/alsa/alsa-kernel/pci/ice1712/ews.h,v
retrieving revision 1.2
diff -u -r1.2 ews.h
--- alsa-kernel/pci/ice1712/ews.h	10 Sep 2002 15:27:27 -0000	1.2
+++ alsa-kernel/pci/ice1712/ews.h	10 Feb 2003 09:47:30 -0000
@@ -33,6 +33,7 @@
 
 #define ICE1712_SUBDEVICE_EWX2496	0x3b153011
 #define ICE1712_SUBDEVICE_EWS88MT	0x3b151511
+#define ICE1712_SUBDEVICE_EWS88MT_NEW	0x3b152511
 #define ICE1712_SUBDEVICE_EWS88D	0x3b152b11
 #define ICE1712_SUBDEVICE_DMX6FIRE	0x3b153811