[Asterisk-cvs] zaptel wct4xxp.c,1.81,1.82

[kpfleming]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv10383

Modified Files:
	wct4xxp.c 
Log Message:
small fix for robbed-bit-signaling mode
small code efficiency improvement


Index: wct4xxp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wct4xxp.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- wct4xxp.c	8 Aug 2005 22:03:11 -0000	1.81
+++ wct4xxp.c	9 Aug 2005 01:24:26 -0000	1.82
@@ -1369,25 +1369,20 @@
 	} else { /* is a T1 card */
 		__t4_configure_t1(wc, span->offset, span->lineconfig, span->txlevel);
 	}
+
 	/* Note clear channel status */
+	wc->tspans[span->offset]->notclear = 0;
 	__set_clear(wc, span->offset);
 	
 	if (!alreadyrunning) {
 		span->flags |= ZT_FLAG_RUNNING;
 		wc->spansstarted++;
-			/* enable interrupts */
+		/* enable interrupts */
 		/* Start DMA, enabling DMA interrupts on read only */
-		if (ts->spanflags & FLAG_2NDGEN)
-#ifdef VPM_SUPPORT
-			wc->dmactrl = 0xc0000000 | (1 << 29) | wc->vpm;
-#else
-			wc->dmactrl = 0xc0000000 | (1 << 29);
-#endif			
-		else
+		wc->dmactrl = 1 << 29;
+		wc->dmactrl |= (ts->spanflags & FLAG_2NDGEN) ? 0xc0000000 : 0xc0000003;
 #ifdef VPM_SUPPORT
-			wc->dmactrl = 0xc0000003 | (1 << 29) | wc->vpm;
-#else
-			wc->dmactrl = 0xc0000003 | (1 << 29);
+		wc->dmactrl |= wc->vpm;
 #endif
 		if (noburst)
 			wc->dmactrl |= (1 << 26);
@@ -1407,8 +1402,8 @@
 	}
 #ifdef VPM_SUPPORT
 	if (!alreadyrunning && !wc->vpm) {
-        wait_a_little();
-        t4_vpm_init(wc);
+		wait_a_little();
+		t4_vpm_init(wc);
 	}
 #endif
 	printk("Completed startup!\n");