[zaptel-commits] trunk r928 - in /trunk: ./ wct4xxp.c wctdm24xxp.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Tue Jan 31 10:23:17 2006
New Revision: 928

URL: http://svn.digium.com/view/zaptel?rev=928&view=rev
Log:
Merged revisions 927 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r927 | markster | 2006-01-31 00:38:05 -0600 (Tue, 31 Jan 2006) | 3 lines

Fix compile warning in tdm2400p and make sure dmactrl is updated if vpm 
detected.

........

Modified:
    trunk/   (props changed)
    trunk/wct4xxp.c
    trunk/wctdm24xxp.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 31 10:23:17 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-922
+/branches/1.2:1-916,918-927

Modified: trunk/wct4xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp.c?rev=928&r1=927&r2=928&view=diff
==============================================================================
--- trunk/wct4xxp.c (original)
+++ trunk/wct4xxp.c Tue Jan 31 10:23:17 2006
@@ -1703,6 +1703,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: trunk/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp.c?rev=928&r1=927&r2=928&view=diff
==============================================================================
--- trunk/wctdm24xxp.c (original)
+++ trunk/wctdm24xxp.c Tue Jan 31 10:23:17 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) {