Skip to contentSkip to conversation

RME DIGI96 ADAT input selection bug fix

PATCH Applied Anders Torger 2 participants 5 messages Jul 1, 2003 – Jul 3, 2003

lore
Share & tools
lore
#0 lore raw

Stefan Mueller found a bug in my Digi96 driver. Sometimes I write != when I mean == or the other way around:

rme96.new.c 2003-07-01 20:13:26.000000000 +0200 renamed from rme96.old.c 2003-07-01 20:13:40.000000000 +0200 +1 -1
@@ -1318,7 +1318,7 @@
        snd_pcm_set_sync(substream);
 
        runtime->hw = snd_rme96_capture_adat_info;
-        if (snd_rme96_getinputtype(rme96) != RME96_INPUT_ANALOG) {
+        if (snd_rme96_getinputtype(rme96) == RME96_INPUT_ANALOG) {
                 /* makes no sense to use analog input. Note that analog
                    expension cards AEB4/8-I are RME96_INPUT_INTERNAL */
                 return -EIO;

-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01

Applied
#1 lore raw

Hi,

At Tue, 1 Jul 2003 20:14:59 +0200,

Quoted 4 lines · Anders Torger

Stefan Mueller found a bug in my Digi96 driver. Sometimes I write != when I mean == or the other way around:

thanks, applied to cvs.

BTW, shall i apply the patch by Martin Langer for unifying the clock source control? it's been pending for long time for evaluation.

first of all, the patch is needed for rmedigicontrol utility, which i'd like to put to alsa-tolls tree now.
it's not critical at all, and nice to have the same controls for all rme cards.

Takashi

-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01

#2 lore raw
Quoted 4 lines · Takashi Iwai

Hi,

At Tue, 1 Jul 2003 20:14:59 +0200,

Quoted 8 lines
Quoted 2 lines · Anders Torger

Stefan Mueller found a bug in my Digi96 driver. Sometimes I write != when I mean == or the other way around:

thanks, applied to cvs.

BTW, shall i apply the patch by Martin Langer for unifying the clock source control? it's been pending for long time for evaluation.

Oh, sorry, I have forgot about that one, could I get to look at the patch again? I suppose it is ok, but it could potentially make the driver refuse sampling from the input (returning -EIO) when there is no signal there. The driver was like that previously, but I don't think that is a good behaviour, so I changed it.

/Anders

-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01

#3 lore raw

At Wed, 2 Jul 2003 15:03:28 +0200,

Quoted 13 lines · Anders Torger
Quoted 10 lines · Takashi Iwai

Hi,

At Tue, 1 Jul 2003 20:14:59 +0200,

Quoted 2 lines · Anders Torger

Stefan Mueller found a bug in my Digi96 driver. Sometimes I write != when I mean == or the other way around:

thanks, applied to cvs.

Quoted 7 lines
Quoted 2 lines

BTW, shall i apply the patch by Martin Langer for unifying the clock source control? it's been pending for long time for evaluation.

Oh, sorry, I have forgot about that one, could I get to look at the patch again? I suppose it is ok, but it could potentially make the driver refuse sampling from the input (returning -EIO) when there is no signal there.

well, i think you're referring to a different patch (yeah, i remember there was something like that, too).

the patch below is the one i wanted to include.
basically this changes only the name of clock source control element to be compliant to the definition in ControlNames.txt.

Takashi

rme96.c.PATCHED renamed from rme96.c +9 -7
@@ -806,10 +806,12 @@
 {
 	switch (mode) {
 	case RME96_CLOCKMODE_SLAVE:
+	        /* AutoSync */ 
 		rme96->wcreg &= ~RME96_WCR_MASTER;
 		rme96->areg &= ~RME96_AR_WSEL;
 		break;
 	case RME96_CLOCKMODE_MASTER:
+	        /* Internal */
 		rme96->wcreg |= RME96_WCR_MASTER;
 		rme96->areg &= ~RME96_AR_WSEL;
 		break;
@@ -1862,15 +1864,15 @@
 		snd_iprintf(buffer, "  sample format: 16 bit\n");
 	}
 	if (rme96->areg & RME96_AR_WSEL) {
-		snd_iprintf(buffer, "  clock mode: word clock\n");
+		snd_iprintf(buffer, "  sample clock source: word clock\n");
 	} else if (rme96->wcreg & RME96_WCR_MASTER) {
-		snd_iprintf(buffer, "  clock mode: master\n");
+		snd_iprintf(buffer, "  sample clock source: internal\n");
 	} else if (snd_rme96_getinputtype(rme96) == RME96_INPUT_ANALOG) {
-		snd_iprintf(buffer, "  clock mode: slave (master anyway due to analog input setting)\n");
+		snd_iprintf(buffer, "  sample clock source: autosync (internal anyway due to analog input setting)\n");
 	} else if (snd_rme96_capture_getrate(rme96, &n) < 0) {
-		snd_iprintf(buffer, "  clock mode: slave (master anyway due to no valid signal)\n");
+		snd_iprintf(buffer, "  sample clock source: autosync (internal anyway due to no valid signal)\n");
 	} else {
-		snd_iprintf(buffer, "  clock mode: slave\n");
+		snd_iprintf(buffer, "  sample clock source: autosync\n");
 	}
 	if (rme96->wcreg & RME96_WCR_PRO) {
 		snd_iprintf(buffer, "  format: AES/EBU (professional)\n");
@@ -2095,7 +2097,7 @@
 static int
 snd_rme96_info_clockmode_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
-	static char *texts[3] = { "Slave", "Master", "Wordclock" };
+	static char *texts[3] = { "AutoSync", "Internal", "Word" };
 	
 	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
 	uinfo->count = 1;
@@ -2418,7 +2420,7 @@
 },
 {
         .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
-	.name =         "Clock Mode",
+	.name =         "Sample Clock Source",
 	.info =         snd_rme96_info_clockmode_control, 
 	.get =          snd_rme96_get_clockmode_control,
 	.put =          snd_rme96_put_clockmode_control
#4 lore raw
Quoted 23 lines · Takashi Iwai

At Wed, 2 Jul 2003 15:03:28 +0200,

Quoted 13 lines · Anders Torger
Quoted 10 lines · Takashi Iwai

Hi,

At Tue, 1 Jul 2003 20:14:59 +0200,

Quoted 2 lines · Anders Torger

Stefan Mueller found a bug in my Digi96 driver. Sometimes I write != when I mean == or the other way around:

thanks, applied to cvs.

Quoted 7 lines
Quoted 2 lines

BTW, shall i apply the patch by Martin Langer for unifying the clock source control? it's been pending for long time for evaluation.

Oh, sorry, I have forgot about that one, could I get to look at the patch again? I suppose it is ok, but it could potentially make the driver refuse sampling from the input (returning -EIO) when there is no signal there.

Quoted 6 lines

well, i think you're referring to a different patch (yeah, i remember there was something like that, too).

the patch below is the one i wanted to include.
basically this changes only the name of clock source control element to be compliant to the definition in ControlNames.txt.

Ah, thanks. It looks perfectly ok to me, I suggest that you apply it. Sorry for not reacting earlier...

/Anders

-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including Data Reports, E-commerce, Portals, and Forums are available now. Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01