[zaptel-commits] mattf: branch 1.4 r4169 - in /branches/1.4/kernel: ./ wct4xxp/

[SVN commits to the Zaptel project]

Author: mattf
Date: Fri Apr 11 16:16:47 2008
New Revision: 4169

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4169
Log:
Make sure that we disable the echo canceller on the old style echocan() function even if parameters are passed in.

Modified:
    branches/1.4/kernel/wct4xxp/vpm450m.c
    branches/1.4/kernel/zaptel-base.c

Modified: branches/1.4/kernel/wct4xxp/vpm450m.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wct4xxp/vpm450m.c?view=diff&rev=4169&r1=4168&r2=4169
==============================================================================
--- branches/1.4/kernel/wct4xxp/vpm450m.c (original)
+++ branches/1.4/kernel/wct4xxp/vpm450m.c Fri Apr 11 16:16:47 2008
@@ -491,6 +491,7 @@
 	 * stack unfriendly.  Stupid, stupid, stupid.  So we disable IRQs so we
 	 * don't run the risk of overflowing the stack while we initialize the
 	 * octasic. */
+	printk("Loading firmware\n");
 #ifdef CONFIG_4KSTACKS
 	local_irq_save(flags);
 #endif
@@ -505,6 +506,8 @@
 		kfree(ChannelOpen);
 		return NULL;
 	}
+	//schedule();
+	printk("Firmware loaded\n");
 	for (x=0;x<128;x++) {
 		/* execute this loop always on 4 span cards but
 		*  on 2 span cards only execute for the channels related to our spans */
@@ -553,6 +556,7 @@
 			}
 		}
 	}
+	printk("Channels configured\n");
 
 #ifdef CONFIG_4KSTACKS
 	local_irq_restore(flags);

Modified: branches/1.4/kernel/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/zaptel-base.c?view=diff&rev=4169&r1=4168&r2=4169
==============================================================================
--- branches/1.4/kernel/zaptel-base.c (original)
+++ branches/1.4/kernel/zaptel-base.c Fri Apr 11 16:16:47 2008
@@ -4644,7 +4644,7 @@
 	if (chan->span) {
 		if (chan->span->echocan_with_params)
 			ret = chan->span->echocan_with_params(chan, ecp, params);
-		else if (!ecp->param_count && chan->span->echocan)
+		else if (chan->span->echocan)
 			ret = chan->span->echocan(chan, ecp->tap_length);
 	}