[zaptel-commits] kpfleming: branch 1.4 r3553 - in /branches/1.4: wct1xxp.c wcte11xp.c

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Fri Dec 21 09:25:12 2007
New Revision: 3553

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3553
Log:
fix a bug in wct1xxp (pointed out on asterisk-dev) and a minor cleanup in wcte11xp.c

Modified:
    branches/1.4/wct1xxp.c
    branches/1.4/wcte11xp.c

Modified: branches/1.4/wct1xxp.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wct1xxp.c?view=diff&rev=3553&r1=3552&r2=3553
==============================================================================
--- branches/1.4/wct1xxp.c (original)
+++ branches/1.4/wct1xxp.c Fri Dec 21 09:25:12 2007
@@ -774,22 +774,20 @@
 	wc->span.maint = t1xxp_maint;
 	wc->span.open = t1xxp_open;
 	wc->span.close = t1xxp_close;
-	if (wc->ise1)
-		wc->span.channels = 31;
-	else
-		wc->span.channels = 24;
 	wc->span.chans = wc->chans;
 	wc->span.flags = ZT_FLAG_RBS;
 	wc->span.ioctl = t1xxp_ioctl;
 	wc->span.pvt = wc;
 	if (wc->ise1) {
+		wc->span.channels = 31;
 		wc->span.deflaw = ZT_LAW_ALAW;
+		wc->span.linecompat = ZT_CONFIG_HDB3 | ZT_CONFIG_CCS | ZT_CONFIG_CRC4;
+		wc->span.spantype = "E1";
+	} else {
+		wc->span.channels = 24;
+		wc->span.deflaw = ZT_LAW_MULAW;
 		wc->span.linecompat = ZT_CONFIG_AMI | ZT_CONFIG_B8ZS | ZT_CONFIG_D4 | ZT_CONFIG_ESF;
 		wc->span.spantype = "T1";
-	} else {
-		wc->span.deflaw = ZT_LAW_MULAW;
-		wc->span.linecompat = ZT_CONFIG_HDB3 | ZT_CONFIG_CCS | ZT_CONFIG_CRC4;
-		wc->span.spantype = "E1";
 	}
 	init_waitqueue_head(&wc->span.maintq);
 	for (x=0;x<wc->span.channels;x++) {

Modified: branches/1.4/wcte11xp.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte11xp.c?view=diff&rev=3553&r1=3552&r2=3553
==============================================================================
--- branches/1.4/wcte11xp.c (original)
+++ branches/1.4/wcte11xp.c Fri Dec 21 09:25:12 2007
@@ -989,10 +989,12 @@
 			wc->span.channels = 32;
 		else
 			wc->span.channels = 31;
+		wc->span.deflaw = ZT_LAW_ALAW;
 		wc->span.spantype = "E1";
 		wc->span.linecompat = ZT_CONFIG_HDB3 | ZT_CONFIG_CCS | ZT_CONFIG_CRC4;
 	} else {
 		wc->span.channels = 24;
+		wc->span.deflaw = ZT_LAW_MULAW;
 		wc->span.spantype = "T1";
 		wc->span.linecompat = ZT_CONFIG_AMI | ZT_CONFIG_B8ZS | ZT_CONFIG_D4 | ZT_CONFIG_ESF;
 	}
@@ -1000,10 +1002,6 @@
 	wc->span.flags = ZT_FLAG_RBS;
 	wc->span.ioctl = t1xxp_ioctl;
 	wc->span.pvt = wc;
-	if (wc->spantype == TYPE_E1)
-		wc->span.deflaw = ZT_LAW_ALAW;
-	else
-		wc->span.deflaw = ZT_LAW_MULAW;
 	init_waitqueue_head(&wc->span.maintq);
 	for (x=0;x<wc->span.channels;x++) {
 		sprintf(wc->chans[x].name, "WCT1/%d/%d", wc->num, x + 1);