[zaptel-commits] mattf: trunk r2831 - in /trunk: ./ wctdm24xxp/base.c

[SVN commits to the Zaptel project]

Author: mattf
Date: Fri Aug 10 17:00:43 2007
New Revision: 2831

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2831
Log:
Merged revisions 2830 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2830 | mattf | 2007-08-10 16:58:27 -0500 (Fri, 10 Aug 2007) | 9 lines

Merged revisions 2829 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2829 | mattf | 2007-08-10 16:54:56 -0500 (Fri, 10 Aug 2007) | 1 line

Make sure we permit MRM commands
........

................

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

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

Modified: trunk/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp/base.c?view=diff&rev=2831&r1=2830&r2=2831
==============================================================================
--- trunk/wctdm24xxp/base.c (original)
+++ trunk/wctdm24xxp/base.c Fri Aug 10 17:00:43 2007
@@ -3060,6 +3060,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);
 
 	
 	/* Configure watchdogs, access, etc */