[svn-commits] mattf: branch 1.4 r2865 - in /branches/1.4: ./ wcte12xp.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Thu Aug 16 15:48:17 2007
New Revision: 2865

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

........
r2864 | mattf | 2007-08-16 15:47:46 -0500 (Thu, 16 Aug 2007) | 1 line

Make sure we enable MRM
........

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

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

Modified: branches/1.4/wcte12xp.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp.c?view=diff&rev=2865&r1=2864&r2=2865
==============================================================================
--- branches/1.4/wcte12xp.c (original)
+++ branches/1.4/wcte12xp.c Thu Aug 16 15:48:17 2007
@@ -1806,6 +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);
 	
 	/* Configure watchdogs, access, etc */
 	t1_setctl(wc, 0x0030, 0x00280048);