[svn-commits] mattf: branch 1.2 r3321 - in /branches/1.2: wctdm24xxp/base.c wcte12xp.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Thu Dec  6 10:40:22 2007
New Revision: 3321

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3321
Log:
Don't mangle old value of this register.  Just set it without the reset bit set

Modified:
    branches/1.2/wctdm24xxp/base.c
    branches/1.2/wcte12xp.c

Modified: branches/1.2/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctdm24xxp/base.c?view=diff&rev=3321&r1=3320&r2=3321
==============================================================================
--- branches/1.2/wctdm24xxp/base.c (original)
+++ branches/1.2/wctdm24xxp/base.c Thu Dec  6 10:40:22 2007
@@ -2521,7 +2521,7 @@
 	newjiffies = jiffies + HZ/10;
 	while(((reg = wctdm_getctl(wc,0x0000)) & 0x00000001) && (newjiffies > jiffies));
 	printk("%s: New Reg: %08x!\n", wc->variety, reg);
-	wctdm_setctl(wc, 0x0000, 0xfffa0000);
+	wctdm_setctl(wc, 0x0000, 0xfff88000);
 
 	
 	/* Configure watchdogs, access, etc */

Modified: branches/1.2/wcte12xp.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wcte12xp.c?view=diff&rev=3321&r1=3320&r2=3321
==============================================================================
--- branches/1.2/wcte12xp.c (original)
+++ branches/1.2/wcte12xp.c Thu Dec  6 10:40:22 2007
@@ -1806,7 +1806,7 @@
 	newjiffies = jiffies + HZ/10;
 	while(((reg = t1_getctl(wc,0x0000)) & 0x00000001) && ( time_after(newjiffies,jiffies) ));
 	debug_printk(1, "ctlreg 0x0000 now=%08x!\n", reg);
-	t1_setctl(wc, 0x0000, 0xfffa0000);
+	t1_setctl(wc, 0x0000, 0xfff88000);
 	
 	/* Configure watchdogs, access, etc */
 	t1_setctl(wc, 0x0030, 0x00280048);