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

[SVN commits to the Digium repositories]

Author: sruffell
Date: Wed Jun 29 11:57:38 2011
New Revision: 10002

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10002
Log:
wctdm24xxp: Ensure battery drops on FXS hangups honor the channel otimer.

If an FXS port is configured to use kewl start signalling, when the FXS port
is "hungup" it should drop battery for 500ms so that any attached devices can
detect that the remote side has disconnected.  The wctdm24xxp driver
since version 2.4.0 was only dropping battery for ~5-10 ms because it would
set "open" on the line, but then the next time it read the line feed register
state, it was setting the LINE feed register to the idle state.

This change checks if the line is forced open before setting the FXS port back
"onhook" so as to not turn on battery prematurely.

This fixes a regression introduced in r9070 "wctdm24xxp: Prevent FXS Proslic
staying in "Forward/Reverse OnHookTransfer...". DAHDI-849.

Checking for open on the line feed registered was originally suggested by Alec
Davis.

Signed-off-by: Shaun Ruffell <sruffell 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=10002&r1=10001&r2=10002
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Wed Jun 29 11:57:38 2011
@@ -2053,7 +2053,8 @@
 						SLIC_LF_ACTIVE_FWD;
 		break;
 	}
-	wctdm_fxs_hooksig(wc, mod, DAHDI_TXSIG_OFFHOOK);
+	if ((fxs->lasttxhook & SLIC_LF_SETMASK) != SLIC_LF_OPEN)
+		wctdm_fxs_hooksig(wc, mod, DAHDI_TXSIG_OFFHOOK);
 	dahdi_hooksig(get_dahdi_chan(wc, mod), DAHDI_RXSIG_OFFHOOK);
 
 #ifdef DEBUG
@@ -2063,6 +2064,17 @@
 	fxs->oldrxhook = 1;
 }
 
+/**
+ * wctdm_fxs_on_hook - Report on hook to DAHDI.
+ * @wc:		Board hosting the module.
+ * @card:	Index of the module / port to place on hook.
+ *
+ * If we are intentionally dropping battery to signal a forward
+ * disconnect we do not want to place the line "On-Hook". In this
+ * case, the core of DAHDI will place us on hook when one of the RBS
+ * timers expires.
+ *
+ */
 static void wctdm_fxs_on_hook(struct wctdm *wc, struct wctdm_module *const mod)
 {
 	struct fxs *const fxs = &mod->mod.fxs;
@@ -2070,7 +2082,8 @@
 		dev_info(&wc->vb.pdev->dev,
 			"fxs_on_hook: Card %d Going on hook\n", mod->card);
 	}
-	wctdm_fxs_hooksig(wc, mod, DAHDI_TXSIG_ONHOOK);
+	if ((fxs->lasttxhook & SLIC_LF_SETMASK) != SLIC_LF_OPEN)
+		wctdm_fxs_hooksig(wc, mod, DAHDI_TXSIG_ONHOOK);
 	dahdi_hooksig(get_dahdi_chan(wc, mod), DAHDI_RXSIG_ONHOOK);
 	fxs->oldrxhook = 0;
 }