Fix detection of ringing on FXO ports. This change was made to wctdm in 1.4

in revision 4096, but when that code got backported to 1.2 in rev 4132, the
change was not made.  I found it just by comparing the differences in the
drivers between 1.2 and 1.4.

(closes issue #13188)
Reported by: pyves
Patches:
      20080731__issue13188_revert4123z12.diff uploaded by bbryant (license 36)
      issue13188.patch1.txt uploaded by russell (license 2)
Tested by: russell, bbryant


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4442 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 3 insertions, 9 deletions

diff --git a/wctdm.c b/wctdm.c
index e64c995..e3498dc 100644
--- a/wctdm.c
+++ b/wctdm.c
@@ -863,16 +863,10 @@ static inline void wctdm_voicedaa_check_hook(struct wctdm *wc, int card)
 					fxo->battalarm = (battalarm - battdebounce) / MS_PER_CHECK_HOOK;
 #endif
 				}
-			}
-			wc->mod[card].fxo.battdebounce = battdebounce;
-		}
-	} else if (abs(b) > battthresh) {
-		if (!wc->mod[card].fxo.battery && !wc->mod[card].fxo.battdebounce) {
-			if (debug)
-				printk("BATTERY on %d/%d (%s)!\n", wc->span.spanno, card + 1, 
-					(b < 0) ? "-" : "+");			    
+			} else {
 				/* start the debounce timer to verify that battery has been lost */
-			fxo->battdebounce = battdebounce / MS_PER_CHECK_HOOK;
+				fxo->battdebounce = battdebounce / MS_PER_CHECK_HOOK;
+			}
 		}
 	} else {
 		/* possible existing states: