[zaptel-commits] branch 1.2 r927 - in /branches/1.2: wct4xxp.c wctdm24xxp.c

[zaptel-commits at lists.digium.com]

Author: markster
Date: Tue Jan 31 00:38:05 2006
New Revision: 927

URL: http://svn.digium.com/view/zaptel?rev=927&view=rev
Log:
Fix compile warning in tdm2400p and make sure dmactrl is updated if vpm 
detected.

Modified:
    branches/1.2/wct4xxp.c
    branches/1.2/wctdm24xxp.c

Modified: branches/1.2/wct4xxp.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct4xxp.c?rev=927&r1=926&r2=927&view=diff
==============================================================================
--- branches/1.2/wct4xxp.c (original)
+++ branches/1.2/wct4xxp.c Tue Jan 31 00:38:05 2006
@@ -1483,6 +1483,8 @@
 	if (!alreadyrunning && !wc->vpm) {
 		wait_a_little();
 		t4_vpm_init(wc);
+		wc->dmactrl |= wc->vpm;
+		t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
 	}
 #endif
 	printk("Completed startup!\n");

Modified: branches/1.2/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctdm24xxp.c?rev=927&r1=926&r2=927&view=diff
==============================================================================
--- branches/1.2/wctdm24xxp.c (original)
+++ branches/1.2/wctdm24xxp.c Tue Jan 31 00:38:05 2006
@@ -2462,7 +2462,7 @@
 	unsigned char reg;
 	unsigned int mask;
 	unsigned int ver;
-	unsigned char vpmver;
+	unsigned char vpmver=0;
 	unsigned int i, x, y;
 
 	if (!vpmsupport) {