[svn-commits] sruffell: linux/trunk r9441 - /linux/trunk/drivers/dahdi/wctdm24xxp/base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Wed Oct 20 07:23:02 2010
New Revision: 9441

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9441
Log:
wctdm24xxp: Leave FXO (DAA) always in full-wave ring detect mode.

In zaptel commit 4096 [1], all the debouncing of ring signals were moved
into software as opposed to using the ring validation circuit in DAA.
That commit failed to remove the initial check and set of the ring
validation circuit.

[1] http://svn.digium.com/view/zaptel?view=revision&revision=4096

(closes issue #16894)
Reported by: rde42

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Kinsey Moore <kmoore at digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks at digium.com>

Modified:
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=9441&r1=9440&r2=9441
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Wed Oct 20 07:23:02 2010
@@ -2653,16 +2653,6 @@
 	reg16 |= (fxo_modes[_opermode].rt);
 	wctdm_setreg(wc, card, 16, reg16);
 
-	if (fwringdetect || neonmwi_monitor) {
-		/* Enable ring detector full-wave rectifier mode */
-		wctdm_setreg(wc, card, 18, 2);
-		wctdm_setreg(wc, card, 24, 0);
-	} else { 
-		/* Set to the device defaults */
-		wctdm_setreg(wc, card, 18, 0);
-		wctdm_setreg(wc, card, 24, 0x19);
-	}
-	
 	/* Enable ring detector full-wave rectifier mode */
 	wctdm_setreg(wc, card, 18, 2);
 	wctdm_setreg(wc, card, 24, 0);