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/xpd.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'xpp/xpd.h') diff --git a/xpp/xpd.h b/xpp/xpd.h index 49272ca..4aa8861 100644 --- a/xpp/xpd.h +++ b/xpp/xpd.h @@ -60,12 +60,12 @@ typedef unsigned gfp_t; /* Added in 2.6.14 */ #define DEF_PARM_BOOL(name,init,perm,desc) \ int name = init; \ module_param(name, bool, perm); \ - MODULE_PARM_DESC(name, desc) + MODULE_PARM_DESC(name, desc " [default " #init "]") #define DEF_PARM(type,name,init,perm,desc) \ type name = init; \ module_param(name, type, perm); \ - MODULE_PARM_DESC(name, desc) + MODULE_PARM_DESC(name, desc " [default " #init "]") #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) /* @@ -208,6 +208,14 @@ struct xbus { atomic_t packet_counter; /* Allocated packets */ wait_queue_head_t packet_cache_empty; + /* PCM metrics */ + struct timeval last_tx_sync; + struct timeval last_rx_sync; + long max_tx_sync; + long min_tx_sync; + long max_rx_sync; + long min_rx_sync; + struct xbus_poller *poller; struct rw_semaphore in_use; @@ -324,6 +332,8 @@ struct xpd { }; #define for_each_line(xpd,i) for((i) = 0; (i) < (xpd)->channels; (i)++) +#define IS_BRI(xpd) ((xpd)->type == XPD_TYPE_BRI_NT || (xpd)->type == XPD_TYPE_BRI_TE) +#define TICK_TOLERANCE 500 /* usec */ #endif -- cgit v1.2.3