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

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Feb 26 15:03:05 2010
New Revision: 8147

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8147
Log:
dahdi: Change 'struct dahdi_spaninfo' in order to maintain Asterisk API compatibility.

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c
    linux/trunk/include/dahdi/kernel.h
    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=8147&r1=8146&r2=8147
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Fri Feb 26 15:03:05 2010
@@ -3838,7 +3838,17 @@
 		stack.spaninfo.alarms = spans[i]->alarms;		/* get alarm status */
 		stack.spaninfo.rxlevel = spans[i]->rxlevel;	/* get rx level */
 		stack.spaninfo.txlevel = spans[i]->txlevel;	/* get tx level */
-		stack.spaninfo.count = spans[i]->count;	/* get counters */
+
+		stack.spaninfo.bpvcount = spans[i]->count.bpv;
+		stack.spaninfo.crc4count = spans[i]->count.crc4;
+		stack.spaninfo.ebitcount = spans[i]->count.ebit;
+		stack.spaninfo.fascount = spans[i]->count.fas;
+		stack.spaninfo.fecount = spans[i]->count.fe;
+		stack.spaninfo.cvcount = spans[i]->count.cv;
+		stack.spaninfo.becount = spans[i]->count.be;
+		stack.spaninfo.prbs = spans[i]->count.prbs;
+		stack.spaninfo.errsec = spans[i]->count.errsec;
+
 		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/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=8147&r1=8146&r2=8147
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Fri Feb 26 15:03:05 2010
@@ -699,6 +699,18 @@
 	DAHDI_FLAGBIT_LOOPED	= 18,	/*!< Loopback the receive data from the channel to the transmit */
 	DAHDI_FLAGBIT_MTP2	= 19,	/*!< Repeats last message in buffer and also discards repeating messages sent to us */
 	DAHDI_FLAGBIT_HDLC56	= 20,	/*!< Sets the given channel (if in HDLC mode) to use 56K HDLC instead of 64K  */
+};
+
+struct dahdi_count {
+	__u32 fe;		/*!< Framing error counter */
+	__u32 cv;		/*!< Coding violations counter */
+	__u32 bpv;		/*!< Bipolar Violation counter */
+	__u32 crc4;		/*!< CRC4 error counter */
+	__u32 ebit;		/*!< current E-bit error count */
+	__u32 fas;		/*!< current FAS error count */
+	__u32 be;		/*!< current bit error count */
+	__u32 prbs;		/*!< current PRBS detected pattern */
+	__u32 errsec;		/*!< errored seconds */
 };
 
 /* map flagbits to flag masks */

Modified: linux/trunk/include/dahdi/user.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/user.h?view=diff&rev=8147&r1=8146&r2=8147
==============================================================================
--- linux/trunk/include/dahdi/user.h (original)
+++ linux/trunk/include/dahdi/user.h Fri Feb 26 15:03:05 2010
@@ -532,18 +532,6 @@
  */
 #define DAHDI_IOMUX			_IOWR(DAHDI_CODE, 9, int)
 
-struct dahdi_count {
-	__u32 fe;		/*!< Framing error counter */
-	__u32 cv;		/*!< Coding violations counter */
-	__u32 bpv;		/*!< Bipolar Violation counter */
-	__u32 crc4;		/*!< CRC4 error counter */
-	__u32 ebit;		/*!< current E-bit error count */
-	__u32 fas;		/*!< current FAS error count */
-	__u32 be;		/*!< current bit error count */
-	__u32 prbs;		/*!< current PRBS detected pattern */
-	__u32 errsec;	/*!< errored seconds */
-};
-
 /*
  * Get Span Status
  */
@@ -554,7 +542,17 @@
 	int	alarms;		/* alarms status */
 	int	txlevel;	/* what TX level is set to */
 	int	rxlevel;	/* current RX level */
-	struct dahdi_count count;/* Performance and Error counters */
+
+	int	bpvcount;	/* current BPV count */
+	int	crc4count;	/* current CRC4 error count */
+	int	ebitcount;	/* current E-bit error count */
+	int	fascount;	/* current FAS error count */
+	__u32	fecount;	/* Framing error counter */
+	__u32	cvcount;	/* Coding violations counter */
+	__u32	becount;	/* current bit error count */
+	__u32	prbs;		/* current PRBS detected pattern */
+	__u32	errsec;		/* errored seconds */
+
 	int	irqmisses;	/* current IRQ misses */
 	int	syncsrc;	/* span # of current sync source,
 				   or 0 for free run */