[zaptel-commits] kpfleming: branch 1.4 r3670 - /branches/1.4/wctdm24xxp/base.c

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Fri Jan 11 16:10:18 2008
New Revision: 3670

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3670
Log:
restore ability of this driver to compile... will finish echo can params code later

Modified:
    branches/1.4/wctdm24xxp/base.c

Modified: branches/1.4/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp/base.c?view=diff&rev=3670&r1=3669&r2=3670
==============================================================================
--- branches/1.4/wctdm24xxp/base.c (original)
+++ branches/1.4/wctdm24xxp/base.c Fri Jan 11 16:10:18 2008
@@ -50,15 +50,15 @@
 #include <linux/moduleparam.h>
 #endif
 
-#ifdef VPM150M_SUPPORT
-#include <linux/firmware.h>
-#endif
-
 #include "zaptel.h"
 #include "proslic.h"
 #include "wctdm.h"
 
 #include "wctdm24xxp.h"
+
+#ifdef VPM150M_SUPPORT
+#include "adt_lec.h"
+#endif
 
 #include "GpakCust.h"
 #include "GpakApi.h"
@@ -1540,8 +1540,8 @@
 	
 		if(debug & DEBUG_ECHOCAN) 
 			printk("echocan: Unit is %d, Channel is  %d length %d\n", 
-				unit, channel, eclen);
-		if (eclen)
+				unit, channel, ecp->tap_length);
+		if (ecp->tap_length)
 			wctdm_vpm_out(wc,unit,channel,0x3e);
 		else
 			wctdm_vpm_out(wc,unit,channel,0x01);
@@ -1551,7 +1551,7 @@
 	} else if (wc->vpm150m) {
 		struct vpm150m *vpm150m = wc->vpm150m;
 
-		if (eclen) {
+		if (ecp->tap_length) {
 			set_bit(chan->chanpos - 1, &vpm150m->desiredecstate);
 			if (test_bit(VPM150M_ACTIVE, &vpm150m->control))
 				queue_work(vpm150m->wq, &vpm150m->work);