summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2011-01-21 05:30:13 +0000
committerShaun Ruffell <sruffell@digium.com>2011-01-21 05:30:13 +0000
commit39eaeaea43228f5a30df01129a3bf362e5ad9ed3 (patch)
tree4b05f25166d60b8b99f6855a35aafb3465914da7
parent328f13cdc71307fad2e22db52e61155063b5b3ca (diff)
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@digium.com> Acked-by: Kinsey Moore <kmoore@digium.com> Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com> Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9441 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9674 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/wctdm24xxp/base.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c
index bec01bb..4cf90b4 100644
--- a/drivers/dahdi/wctdm24xxp/base.c
+++ b/drivers/dahdi/wctdm24xxp/base.c
@@ -2653,16 +2653,6 @@ static int wctdm_init_voicedaa(struct wctdm *wc, int card, int fast, int manual,
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);