[svn-commits] rmeyerriecks: linux/trunk r8291 - in /linux/trunk/drivers/dahdi: ./ wct4xxp/ ...

[SVN commits to the Digium repositories]

Author: rmeyerriecks
Date: Mon Mar  8 17:22:54 2010
New Revision: 8291

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8291
Log:
wct4xxp, wcte12xp: Fixed broken E1 and unsupported function bugs

* Fixed the bug where the card could not be brought out of local
  loopback in E1 mode.

* Fixed a bunch of issues where the drivers didn't report unsupported
  maintenance functions correctly.

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c
    linux/trunk/drivers/dahdi/wct4xxp/base.c
    linux/trunk/drivers/dahdi/wcte12xp/base.c

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=8291&r1=8290&r2=8291
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Mon Mar  8 17:22:54 2010
@@ -4545,6 +4545,7 @@
 			module_printk(KERN_NOTICE,
 				      "Unknown maintenance event: %d\n",
 				      maint.command);
+			return -ENOSYS;
 		}
 		dahdi_alarm_notify(spans[maint.spanno]);  /* process alarm-related events */
 		spin_unlock_irqrestore(&spans[maint.spanno]->lock, flags);

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=8291&r1=8290&r2=8291
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/base.c Mon Mar  8 17:22:54 2010
@@ -1437,6 +1437,7 @@
 		switch(cmd) {
 		case DAHDI_MAINT_NONE:
 			dev_info(&wc->dev->dev, "Clearing all maint modes\n");
+			t4_clear_maint(span);
 			break;
 		case DAHDI_MAINT_LOCALLOOP:
 			dev_info(&wc->dev->dev,
@@ -1451,11 +1452,11 @@
 		case DAHDI_MAINT_LOOPSTOP:
 			dev_info(&wc->dev->dev,
 					"Only local loop supported in E1 mode\n");
-			break;
+			return -ENOSYS;
 		default:
 			dev_info(&wc->dev->dev,
 					"Unknown E1 maint command: %d\n", cmd);
-			break;
+			return -ENOSYS;
 		}
 	} else {
 		switch(cmd) {
@@ -1535,7 +1536,7 @@
 			reg &= ~FLLB;
 			t4_framer_out(wc, span->offset, LCR1_T, reg);
 #endif
-			break;
+			return -ENOSYS;
 		case DAHDI_RESET_COUNTERS:
 			t4_reset_counters(span);
 			break;

Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=8291&r1=8290&r2=8291
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Mon Mar  8 17:22:54 2010
@@ -1111,6 +1111,7 @@
 		switch (cmd) {
 		case DAHDI_MAINT_NONE:
 			t1_info(wc, "Clearing all maint modes\n");
+			t1xxp_clear_maint(span);
 			break;
 		case DAHDI_MAINT_LOCALLOOP:
 			t1xxp_clear_maint(span);
@@ -1122,10 +1123,10 @@
 		case DAHDI_MAINT_LOOPDOWN:
 		case DAHDI_MAINT_LOOPSTOP:
 			t1_info(wc, "Only local loop supported in E1 mode\n");
-			break;
+			return -ENOSYS;
 		default:
 			t1_info(wc, "Unknown E1 maint command: %d\n", cmd);
-			break;
+			return -ENOSYS;
 		}
 	} else {
 		switch (cmd) {
@@ -1161,7 +1162,7 @@
 			break;
 		default:
 			t1_info(wc, "Unknown T1 maint command: %d\n", cmd);
-			break;
+			return -ENOSYS;
 		}
 	}