[zaptel-commits] mattf: branch 1.4 r3322 - in /branches/1.4: ./ wctdm24xxp/base.c wcte12xp.c

[SVN commits to the Zaptel project]

Author: mattf
Date: Thu Dec  6 10:41:43 2007
New Revision: 3322

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

........
r3321 | mattf | 2007-12-06 10:40:22 -0600 (Thu, 06 Dec 2007) | 1 line

Don't mangle old value of this register.  Just set it without the reset bit set
........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/wctdm24xxp/base.c
    branches/1.4/wcte12xp.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp/base.c?view=diff&rev=3322&r1=3321&r2=3322
==============================================================================
--- branches/1.4/wctdm24xxp/base.c (original)
+++ branches/1.4/wctdm24xxp/base.c Thu Dec  6 10:41:43 2007
@@ -3129,7 +3129,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.4/wcte12xp.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp.c?view=diff&rev=3322&r1=3321&r2=3322
==============================================================================
--- branches/1.4/wcte12xp.c (original)
+++ branches/1.4/wcte12xp.c Thu Dec  6 10:41:43 2007
@@ -1813,7 +1813,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);