diff options
author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-04-29 22:44:32 +0000 |
---|---|---|
committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-04-29 22:44:32 +0000 |
commit | 21263d58b5659eb42d200a38b17da18fce49a881 (patch) | |
tree | 205cbb81e5906362c4be4eb11800f028694c620f /xpp/xbus-core.c | |
parent | 2c5d383ce7ad82476fe1687b9d29aad87a80e6ee (diff) |
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
Diffstat (limited to 'xpp/xbus-core.c')
-rw-r--r-- | xpp/xbus-core.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/xpp/xbus-core.c b/xpp/xbus-core.c index 690d9d2..a5544b9 100644 --- a/xpp/xbus-core.c +++ b/xpp/xbus-core.c @@ -47,7 +47,7 @@ static const char rcsid[] = "$Id$"; /* Defines */ #define POLL_TIMEOUT (2*MAX_XPDS) /* in jiffies */ -#define INITIALIZATION_TIMEOUT (40*HZ) /* in jiffies */ +#define INITIALIZATION_TIMEOUT (60*HZ) /* in jiffies */ #define PROC_XBUSES "xbuses" #define PROC_XBUS_SUMMARY "summary" #define PROC_XBUS_WAITFOR_XPDS "waitfor_xpds" @@ -59,7 +59,7 @@ static int proc_xbus_command_write(struct file *file, const char __user *buffer, /* Command line parameters */ extern int print_dbg; -DEF_PARM(uint, poll_timeout, POLL_TIMEOUT, 0600, "Timeout (in jiffies) waiting for units to reply (default " __stringify(POLL_TIMEOUT) ")"); +DEF_PARM(uint, poll_timeout, POLL_TIMEOUT, 0644, "Timeout (in jiffies) waiting for units to reply"); /* Forward declarations */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14) @@ -830,6 +830,8 @@ xbus_t *xbus_new(xbus_ops_t *ops) INFO("New xbus: %s\n", xbus->busname); init_waitqueue_head(&xbus->packet_cache_empty); atomic_set(&xbus->packet_counter, 0); + xbus->min_tx_sync = INT_MAX; + xbus->min_rx_sync = INT_MAX; xbus->num_xpds = 0; poller = poller_new(xbus); @@ -1008,6 +1010,11 @@ static int xbus_read_proc(char *page, char **start, off_t off, int count, int *e xbus->open_counter, atomic_read(&xbus->packet_counter) ); + len += sprintf(page + len, "PCM Metrices:\n"); + len += sprintf(page + len, "\tPCM TX: min=%ld max=%ld\n", + xbus->min_tx_sync, xbus->max_tx_sync); + len += sprintf(page + len, "\tPCM RX: min=%ld max=%ld\n", + xbus->min_rx_sync, xbus->max_rx_sync); len += sprintf(page + len, "COUNTERS:\n"); for(i = 0; i < XBUS_COUNTER_MAX; i++) { len += sprintf(page + len, "\t%-15s = %d\n", @@ -1271,6 +1278,7 @@ int __init xbus_core_init(void) DBG("Creating debugfs xpp root\n"); debugfs_root = debugfs_create_dir("xpp", NULL); if(!debugfs_root) { + ERR("Failed to create debugfs root\n"); ret = -EFAULT; goto err; } |