[svn-commits] sruffell: linux/trunk r8120 - in /linux/trunk: drivers/dahdi/ include/dahdi/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Feb 26 10:40:42 2010
New Revision: 8120

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8120
Log:
dahdi: Add line options for BRI NT/TE mode and termination resistance.

Modified:
    linux/trunk/drivers/dahdi/dahdi-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=8120&r1=8119&r2=8120
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Fri Feb 26 10:40:42 2010
@@ -4075,7 +4075,8 @@
 		if (copy_from_user(&lc, user_data, sizeof(lc)))
 			return -EFAULT;
 		VALID_SPAN(lc.span);
-		if ((lc.lineconfig & 0x07f0 & spans[lc.span]->linecompat) != (lc.lineconfig & 0x07f0))
+		if ((lc.lineconfig & 0x1ff0 & spans[lc.span]->linecompat) !=
+		    (lc.lineconfig & 0x1ff0))
 			return -EINVAL;
 		if (spans[lc.span]->spanconfig) {
 			spans[lc.span]->lineconfig = lc.lineconfig;

Modified: linux/trunk/include/dahdi/user.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/user.h?view=diff&rev=8120&r1=8119&r2=8120
==============================================================================
--- linux/trunk/include/dahdi/user.h (original)
+++ linux/trunk/include/dahdi/user.h Fri Feb 26 10:40:42 2010
@@ -56,6 +56,9 @@
 #define DAHDI_CONFIG_HDB3	(1 << 9)			/* HDB3 instead of AMI (line coding) */
 #define DAHDI_CONFIG_CRC4	(1 << 10)			/* CRC4 framing */
 #define DAHDI_CONFIG_NOTOPEN	(1 << 16)
+/* These apply to BRI */
+#define DAHDI_CONFIG_NTTE	(1 << 11)			/* To enable NT mode, set this bit to 1, for TE this should be 0 */
+#define DAHDI_CONFIG_TERM	(1 << 12)			/* To enable Termination resistance set this bit to 1 */
 
 /* Signalling types */
 #define DAHDI_SIG_BROKEN	(1 << 31)			/* The port is broken and/or failed initialization */