From 21263d58b5659eb42d200a38b17da18fce49a881 Mon Sep 17 00:00:00 2001 From: tzafrir Date: Sun, 29 Apr 2007 22:44:32 +0000 Subject: xpp rev. 3814: * Protocol no. 2.6: syncing improvements. * Support for 8-port Astribank BRI. * Firmware unloading now works: rmmod xpp_usb; /etc/hotplug/usb/xpp_fxloader reset * Defaults of kernel parameters are now part of parameter description. * World-readable kernel parameters. * No need for extra patch beyond bristuff for Astribank BRI. * Default poll intervals changed: 500 in BRI and FXO. * Allow changing FXS polls interval at run time. * BRI initalization fixed on SUSE (path to logger). * When using the SUSE zaptel rpm package, set modules_var=ZAPTEL_MODULES in /etc/sysconfig/zaptel . * zt_registration not verbose by default. * xpp_sync warns if FXO is sync slave. * Fixed genzaptelconf -z (zapscan output emulation). * PCM fixes. * Solves "multiple ticks" bug. No need for pcm_tasklets workaround. git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2478 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- xpp/card_fxs.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'xpp/card_fxs.c') diff --git a/xpp/card_fxs.c b/xpp/card_fxs.c index fd50c3d..a5d4654 100644 --- a/xpp/card_fxs.c +++ b/xpp/card_fxs.c @@ -33,9 +33,9 @@ static const char rcsid[] = "$Id$"; -DEF_PARM(int, print_dbg, 0, 0600, "Print DBG statements"); /* must be before zap_debug.h */ -DEF_PARM_BOOL(poll_digital_inputs, 1, 0600, "Poll Digital Inputs"); -DEF_PARM_BOOL(reversepolarity, 0, 0600, "Reverse Line Polarity"); +DEF_PARM(int, print_dbg, 0, 0644, "Print DBG statements"); /* must be before zap_debug.h */ +DEF_PARM(uint, poll_digital_inputs, 1000, 0644, "Poll Digital Inputs"); +DEF_PARM_BOOL(reversepolarity, 0, 0644, "Reverse Line Polarity"); /* Signaling is opposite (fxo signalling for fxs card) */ #if 1 @@ -782,7 +782,6 @@ static void detect_vmwi(xpd_t *xpd) static int FXS_card_tick(xbus_t *xbus, xpd_t *xpd) { - static int rate_limit = 0; struct FXS_priv_data *priv; BUG_ON(!xpd); @@ -790,9 +789,8 @@ static int FXS_card_tick(xbus_t *xbus, xpd_t *xpd) BUG_ON(!priv); #if POLL_DIGITAL_INPUTS if(poll_digital_inputs && xpd->id == 0) { - if((rate_limit++ % 1000) == 0) { + if((xpd->timer_count % poll_digital_inputs) == 0) poll_inputs(xbus, xpd); - } } #endif handle_fxs_leds(xpd); @@ -1335,8 +1333,8 @@ int __init card_fxs_startup(void) { INFO("%s revision %s\n", THIS_MODULE->name, XPP_VERSION); #ifdef POLL_DIGITAL_INPUTS - INFO("FEATURE: %s with DIGITAL INPUTS support (%s activated)\n", - THIS_MODULE->name, (poll_digital_inputs) ? "is" : "is not"); + INFO("FEATURE: %s with DIGITAL INPUTS support (polled every %d msec)\n", + THIS_MODULE->name, poll_digital_inputs); #else INFO("FEATURE: %s without DIGITAL INPUTS support\n", THIS_MODULE->name); #endif -- cgit v1.2.3