[zaptel-commits] mattf: branch 1.4 r2947 - /branches/1.4/zaptel-base.c

[SVN commits to the Zaptel project]

Author: mattf
Date: Fri Aug 24 14:39:22 2007
New Revision: 2947

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2947
Log:
More backport code

Modified:
    branches/1.4/zaptel-base.c

Modified: branches/1.4/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/zaptel-base.c?view=diff&rev=2947&r1=2946&r2=2947
==============================================================================
--- branches/1.4/zaptel-base.c (original)
+++ branches/1.4/zaptel-base.c Fri Aug 24 14:39:22 2007
@@ -593,6 +593,8 @@
 		len += sprintf(page + len, "\tFAS error count: %d\n", spans[span]->fascount);
 	if (spans[span]->irqmisses)
 		len += sprintf(page + len, "\tIRQ misses: %d\n", spans[span]->irqmisses);
+	if (spans[span]->timingslips)
+		len += sprintf(page + len, "\tTiming slips: %d\n", spans[span]->timingslips);
 	len += sprintf(page + len, "\n");
 
 
@@ -4780,7 +4782,8 @@
 
 #ifdef CONFIG_ZAP_UDEV
 	for (x = 0; x < span->channels; x++) {
-		class_device_destroy(zap_class, MKDEV(ZT_MAJOR, span->chans[x].channo));
+		if (span->chans[x].channo < 250)
+			class_device_destroy(zap_class, MKDEV(ZT_MAJOR, span->chans[x].channo));
 	}
 #endif /* CONFIG_ZAP_UDEV */
 
@@ -6424,7 +6427,7 @@
 	__putbuf_chunk(ss, rxb, ZT_CHUNKSIZE);
 }
 
-void __zt_hdlc_abort(struct zt_chan *ss, int event)
+static void __zt_hdlc_abort(struct zt_chan *ss, int event)
 {
 	if (ss->inreadbuf >= 0)
 		ss->readidx[ss->inreadbuf] = 0;
@@ -6800,6 +6803,10 @@
 	int x,y,z;
 	unsigned long flags;
 
+#ifdef	ZAPTEL_SYNC_TICK
+	if (span->sync_tick)
+		span->sync_tick(span, span == master);
+#endif
 #if 1
 	for (x=0;x<span->channels;x++) {
 		spin_lock_irqsave(&span->chans[x].lock, flags);