[dahdi-commits] rmeyerriecks: branch linux/rmeyerriecks/dahdi-linux-maintmodes r7679 - in /li...

[SVN commits to the DAHDI project]

Author: rmeyerriecks
Date: Thu Dec 10 17:26:02 2009
New Revision: 7679

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7679
Log:
Squelched some over verbose instrumentation
Exported errored second out to userspace. The errored second counter increments
once per second when any of the following events happen:
- Loss of frame alignment
- Frameing error
- CRC error
- Alarm indication signal (blue alarm)
- Loss of signal
- Code violation
- Slips in the receive direction
- E-bit error

Modified:
    linux/team/rmeyerriecks/dahdi-linux-maintmodes/drivers/dahdi/dahdi-base.c
    linux/team/rmeyerriecks/dahdi-linux-maintmodes/drivers/dahdi/wct4xxp/base.c
    linux/team/rmeyerriecks/dahdi-linux-maintmodes/include/dahdi/user.h

Modified: linux/team/rmeyerriecks/dahdi-linux-maintmodes/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/rmeyerriecks/dahdi-linux-maintmodes/drivers/dahdi/dahdi-base.c?view=diff&rev=7679&r1=7678&r2=7679
==============================================================================
--- linux/team/rmeyerriecks/dahdi-linux-maintmodes/drivers/dahdi/dahdi-base.c (original)
+++ linux/team/rmeyerriecks/dahdi-linux-maintmodes/drivers/dahdi/dahdi-base.c Thu Dec 10 17:26:02 2009
@@ -3821,6 +3821,7 @@
 		stack.spaninfo.becount = spans[i]->becount;	/* get bit error count */
 		stack.spaninfo.prbscount = spans[i]->prbscount;	/* get prbs status register */
 		stack.spaninfo.fascount = spans[i]->fascount;	/* get FAS error count */
+		stack.spaninfo.errsec = spans[i]->errsec;	/* get errored seconds */
 		stack.spaninfo.irqmisses = spans[i]->irqmisses;	/* get IRQ miss count */
 		stack.spaninfo.syncsrc = spans[i]->syncsrc;	/* get active sync source */
 		stack.spaninfo.totalchans = spans[i]->channels;

Modified: linux/team/rmeyerriecks/dahdi-linux-maintmodes/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/rmeyerriecks/dahdi-linux-maintmodes/drivers/dahdi/wct4xxp/base.c?view=diff&rev=7679&r1=7678&r2=7679
==============================================================================
--- linux/team/rmeyerriecks/dahdi-linux-maintmodes/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/team/rmeyerriecks/dahdi-linux-maintmodes/drivers/dahdi/wct4xxp/base.c Thu Dec 10 17:26:02 2009
@@ -2842,8 +2842,6 @@
 	struct dahdi_chan *sigchan;
 	unsigned long flags;
 
-	if (debug & DEBUG_FRAMER)	
-		printk(KERN_DEBUG "framer interrupt span %d:%d!\n", wc->num, span + 1);
 
 	/* 1st gen cards isn't used interrupts */
 	gis = t4_framer_in(wc, span, FRMR_GIS);
@@ -2853,8 +2851,10 @@
 	isr3 = (gis & FRMR_GIS_ISR3) ? t4_framer_in(wc, span, FRMR_ISR3) : 0;
 	isr4 = (gis & FRMR_GIS_ISR4) ? t4_framer_in(wc, span, FRMR_ISR4) : 0;
 
-	if (debug & DEBUG_FRAMER & !(isr3 & ISR3_SEC))
+	if (debug & DEBUG_FRAMER & !(isr3 & ISR3_SEC)) {
+		printk(KERN_DEBUG "framer interrupt span %d:%d!\n", wc->num, span + 1);
 		printk(KERN_DEBUG "gis: %02x, isr0: %02x, isr1: %02x, isr2: %02x, isr3: %08x, isr4: %02x\n", gis, isr0, isr1, isr2, isr3, isr4);
+	}
 
 	if (isr3 & ISR3_SEC) {
 		ts->span.fecount += t4_framer_in(wc, span, FECL_T);
@@ -2867,7 +2867,7 @@
 
 	if (isr3 & ISR3_ES) {
 		ts->span.errsec += 1;
-		dev_info(&wc->dev->dev, "Errored second\n");
+		dev_info(&wc->dev->dev, "Errored second: span %d\n", span+1);
 	}
 
 	if (isr3 & 0x08) {

Modified: linux/team/rmeyerriecks/dahdi-linux-maintmodes/include/dahdi/user.h
URL: http://svnview.digium.com/svn/dahdi/linux/team/rmeyerriecks/dahdi-linux-maintmodes/include/dahdi/user.h?view=diff&rev=7679&r1=7678&r2=7679
==============================================================================
--- linux/team/rmeyerriecks/dahdi-linux-maintmodes/include/dahdi/user.h (original)
+++ linux/team/rmeyerriecks/dahdi-linux-maintmodes/include/dahdi/user.h Thu Dec 10 17:26:02 2009
@@ -547,6 +547,7 @@
 	int	fascount;	/* current FAS error count */
 	int	becount;	/* current bit error count */
 	int	prbscount;	/* current PRBS detection register */
+	int	errsec;		/* current errored seconds */
 	int	irqmisses;	/* current IRQ misses */
 	int	syncsrc;	/* span # of current sync source, or 0 for free run  */
 	int	numchans;	/* number of configured channels on this span */