[zaptel-commits] sruffell: branch 1.4 r4194 - in /branches: 1.2/wctdm.c 1.4/kernel/wctdm.c

[SVN commits to the Zaptel project]

Author: sruffell
Date: Thu Apr 24 13:17:12 2008
New Revision: 4194

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4194
Log:
Fixes a regression in versions 1.2.25 and 1.4.19 identified by korihor where
the wctdm driver was no longer properly recognizing polarity reversals.

(closes issue #12419)

Modified:
    branches/1.2/wctdm.c
    branches/1.4/kernel/wctdm.c

Modified: branches/1.2/wctdm.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctdm.c?view=diff&rev=4194&r1=4193&r2=4194
==============================================================================
--- branches/1.2/wctdm.c (original)
+++ branches/1.2/wctdm.c Thu Apr 24 13:17:12 2008
@@ -915,18 +915,18 @@
 				fxo->battdebounce = battdebounce / MS_PER_CHECK_HOOK;
 			}
 		}
-
-		if (fxo->lastpol >= 0) {
-			if (b < 0) {
-				fxo->lastpol = -1;
-				fxo->polaritydebounce = POLARITY_DEBOUNCE / MS_PER_CHECK_HOOK;
-			}
-		} 
-		if (fxo->lastpol <= 0) {
-			if (b > 0) {
-				fxo->lastpol = 1;
-				fxo->polaritydebounce = POLARITY_DEBOUNCE / MS_PER_CHECK_HOOK;
-			}
+	}
+
+	if (fxo->lastpol >= 0) {
+		if (b < 0) {
+			fxo->lastpol = -1;
+			fxo->polaritydebounce = POLARITY_DEBOUNCE / MS_PER_CHECK_HOOK;
+		}
+	} 
+	if (fxo->lastpol <= 0) {
+		if (b > 0) {
+			fxo->lastpol = 1;
+			fxo->polaritydebounce = POLARITY_DEBOUNCE / MS_PER_CHECK_HOOK;
 		}
 	}
 

Modified: branches/1.4/kernel/wctdm.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctdm.c?view=diff&rev=4194&r1=4193&r2=4194
==============================================================================
--- branches/1.4/kernel/wctdm.c (original)
+++ branches/1.4/kernel/wctdm.c Thu Apr 24 13:17:12 2008
@@ -909,18 +909,18 @@
 				fxo->battdebounce = battdebounce / MS_PER_CHECK_HOOK;
 			}
 		}
-
-		if (fxo->lastpol >= 0) {
-			if (b < 0) {
-				fxo->lastpol = -1;
-				fxo->polaritydebounce = POLARITY_DEBOUNCE / MS_PER_CHECK_HOOK;
-			}
-		} 
-		if (fxo->lastpol <= 0) {
-			if (b > 0) {
-				fxo->lastpol = 1;
-				fxo->polaritydebounce = POLARITY_DEBOUNCE / MS_PER_CHECK_HOOK;
-			}
+	}
+
+	if (fxo->lastpol >= 0) {
+		if (b < 0) {
+			fxo->lastpol = -1;
+			fxo->polaritydebounce = POLARITY_DEBOUNCE / MS_PER_CHECK_HOOK;
+		}
+	} 
+	if (fxo->lastpol <= 0) {
+		if (b > 0) {
+			fxo->lastpol = 1;
+			fxo->polaritydebounce = POLARITY_DEBOUNCE / MS_PER_CHECK_HOOK;
 		}
 	}