[svn-commits] kpfleming: branch linux/kpfleming/echocan_work r6486 - in /linux/team/kpflemi...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Sat Apr 25 10:38:21 CDT 2009


Author: kpfleming
Date: Sat Apr 25 10:38:18 2009
New Revision: 6486

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6486
Log:
add a name field to dahdi_echocan_ops, so that proc files can report the name of the current echocan running on a channel; also change the tag for the assigned software echocan in the proc files from EC to SWEC


Modified:
    linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c
    linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_jpah.c
    linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c
    linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c
    linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_oslec.c
    linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec.c
    linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec2.c
    linux/team/kpfleming/echocan_work/drivers/dahdi/hpec/dahdi_echocan_hpec.c
    linux/team/kpfleming/echocan_work/include/dahdi/kernel.h

Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c?view=diff&rev=6486&r1=6485&r2=6486
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c Sat Apr 25 10:38:18 2009
@@ -655,8 +655,12 @@
 				chan->chan_alarms);
 
 		if (chan->ec_factory)
-			len += snprintf(page+len, count-len, " (EC: %s) ",
+			len += snprintf(page+len, count-len, "(SWEC: %s) ",
 					chan->ec_factory->name);
+
+		if (chan->ec_state)
+			len += snprintf(page+len, count-len, "(EC: %s) ",
+					chan->ec_state->ops->name);
 
 		len += snprintf(page+len, count-len, "\n");
 

Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_jpah.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_jpah.c?view=diff&rev=6486&r1=6485&r2=6486
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_jpah.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_jpah.c Sat Apr 25 10:38:18 2009
@@ -53,6 +53,7 @@
 };
 
 static const struct dahdi_echocan_ops my_ops = {
+	.name = "JPAH",
 	.echocan_free = echo_can_free,
 	.echocan_array_update = echo_can_array_update,
 	.echocan_traintap = echo_can_traintap,

Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c?view=diff&rev=6486&r1=6485&r2=6486
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c Sat Apr 25 10:38:18 2009
@@ -160,6 +160,7 @@
 };
 
 static const struct dahdi_echocan_ops my_ops = {
+	.name = "KB1",
 	.echocan_free = echo_can_free,
 	.echocan_array_update = echo_can_array_update,
 	.echocan_traintap = echo_can_traintap,

Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c?view=diff&rev=6486&r1=6485&r2=6486
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c Sat Apr 25 10:38:18 2009
@@ -192,6 +192,7 @@
 };
 
 static const struct dahdi_echocan_ops my_ops = {
+	.name = "MG2",
 	.echocan_free = echo_can_free,
 	.echocan_array_update = echo_can_array_update,
 	.echocan_traintap = echo_can_traintap,

Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_oslec.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_oslec.c?view=diff&rev=6486&r1=6485&r2=6486
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_oslec.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_oslec.c Sat Apr 25 10:38:18 2009
@@ -50,6 +50,7 @@
 };
 
 static const struct dahdi_echocan_ops my_ops = {
+	.name = "OSLEC",
 	.echocan_free = echo_can_free,
 	.echocan_array_update = echo_can_array_update,
 	.echocan_traintap = echo_can_traintap,

Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec.c?view=diff&rev=6486&r1=6485&r2=6486
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec.c Sat Apr 25 10:38:18 2009
@@ -98,6 +98,7 @@
 };
 
 static const struct dahdi_echocan_ops my_ops = {
+	.name = "SEC",
 	.echocan_free = echo_can_free,
 	.echocan_array_update = echo_can_array_update,
 	.echocan_traintap = echo_can_traintap,

Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec2.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec2.c?view=diff&rev=6486&r1=6485&r2=6486
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec2.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec2.c Sat Apr 25 10:38:18 2009
@@ -89,6 +89,7 @@
 };
 
 static const struct dahdi_echocan_ops my_ops = {
+	.name = "SEC2",
 	.echocan_free = echo_can_free,
 	.echocan_array_update = echo_can_array_update,
 	.echocan_traintap = echo_can_traintap,

Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/hpec/dahdi_echocan_hpec.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/hpec/dahdi_echocan_hpec.c?view=diff&rev=6486&r1=6485&r2=6486
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/hpec/dahdi_echocan_hpec.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/hpec/dahdi_echocan_hpec.c Sat Apr 25 10:38:18 2009
@@ -55,6 +55,7 @@
 };
 
 static const struct dahdi_echocan_ops my_ops = {
+	.name = "HPEC",
 	.echocan_free = echo_can_free,
 	.echocan_array_update = echo_can_array_update,
 	.echocan_traintap = echo_can_traintap,

Modified: linux/team/kpfleming/echocan_work/include/dahdi/kernel.h
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/include/dahdi/kernel.h?view=diff&rev=6486&r1=6485&r2=6486
==============================================================================
--- linux/team/kpfleming/echocan_work/include/dahdi/kernel.h (original)
+++ linux/team/kpfleming/echocan_work/include/dahdi/kernel.h Sat Apr 25 10:38:18 2009
@@ -195,6 +195,9 @@
  * with a pointer to the relevant operations structure for that instance.
  */
 struct dahdi_echocan_ops {
+
+	/*! The name of the echocan that created this structure. */
+	const char *name;
 
 	/*! \brief Free an echocan state structure.
 	 * \param[in,out] ec Pointer to the state structure to free.




More information about the svn-commits mailing list