[svn-commits] rmeyerriecks: linux/trunk r8999 - in /linux/trunk: drivers/dahdi/ drivers/dah...

[SVN commits to the Digium repositories]

Author: rmeyerriecks
Date: Mon Jul 26 15:14:49 2010
New Revision: 8999

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8999
Log:
Added hardware transformer check

QuadFalc has the ability to test if the transformer is
performing correctly. If the components between the framer
and the physical span interface are shorted out or opened
for any reason we can now detect it. Possible causes for
tripping this error could be a broken transformer from
an electrical spike or a board manufacturing error.

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c
    linux/trunk/drivers/dahdi/wct4xxp/base.c
    linux/trunk/include/dahdi/user.h

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=8999&r1=8998&r2=8999
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Mon Jul 26 15:14:49 2010
@@ -3523,16 +3523,6 @@
 				module_printk(KERN_NOTICE,
 					"Span %d: Loss of Multi-Frame "\
 					"Alignment\n", span->spanno);
-			}
-			if (span->alarms & DAHDI_ALARM_XLS) {
-				module_printk(KERN_NOTICE,
-					"Span %d: Transmit Line Short\n",
-					span->spanno);
-			}
-			if (span->alarms & DAHDI_ALARM_XLO) {
-				module_printk(KERN_NOTICE,
-					"Span %d: Transmit Line Open\n",
-					span->spanno);
 			}
 		}
 	}

Modified: linux/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=8999&r1=8998&r2=8999
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/base.c Mon Jul 26 15:14:49 2010
@@ -3007,10 +3007,13 @@
 			alarms |= DAHDI_ALARM_LFA;
 		if (c & FRS0_LMFA)
 			alarms |= DAHDI_ALARM_LMFA;
-		if (d & FRS1_XLS)
-			alarms |= DAHDI_ALARM_XLS;
-		if (d & FRS1_XLO)
-			alarms |= DAHDI_ALARM_XLO;
+	}
+
+	/* Check to ensure the transformer isn't busted */
+	if (unlikely((d & FRS1_XLO) || (d & FRS1_XLS))) {
+		dev_info(&wc->dev->dev,
+			"Detected a possible hardware malfunction"\
+			" this card may need servicing\n");
 	}
 
 	if (((!ts->span.alarms) && alarms) || 

Modified: linux/trunk/include/dahdi/user.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/user.h?view=diff&rev=8999&r1=8998&r2=8999
==============================================================================
--- linux/trunk/include/dahdi/user.h (original)
+++ linux/trunk/include/dahdi/user.h Mon Jul 26 15:14:49 2010
@@ -325,8 +325,6 @@
 #define DAHDI_ALARM_LOS			(1 << 8) /* Loss of Signal */
 #define DAHDI_ALARM_LFA			(1 << 9) /* Loss of Frame Alignment */
 #define DAHDI_ALARM_LMFA		(1 << 10)/* Loss of Multi-Frame Align */
-#define DAHDI_ALARM_XLS			(1 << 11)/* Transmit line Short */
-#define DAHDI_ALARM_XLO			(1 << 12)/* Transmit line Open */
 
 /* Maintenance modes */
 #define DAHDI_MAINT_NONE		0	/* Normal Mode */