[svn-commits] sruffell: linux/trunk r9781 - in /linux/trunk/drivers/dahdi: voicebus/ wctdm2...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Feb 28 08:19:25 2011
New Revision: 9781

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9781
Log:
wcte12xp, wctdm24xxp: Remove unused support for booting VPMADT032 from SPI.

Since there never was a VPMADT032 module shipped with non-volatile
memory no need to check that bit contantly in interrupt context.  Also
remove the unused VPM150M_DTMFDETECT bit.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Modified:
    linux/trunk/drivers/dahdi/voicebus/GpakCust.h
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/drivers/dahdi/wcte12xp/base.c

Modified: linux/trunk/drivers/dahdi/voicebus/GpakCust.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/GpakCust.h?view=diff&rev=9781&r1=9780&r2=9781
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/GpakCust.h (original)
+++ linux/trunk/drivers/dahdi/voicebus/GpakCust.h Mon Feb 28 08:19:25 2011
@@ -72,10 +72,8 @@
 #define __VPM150M_TX		(1 << 0)
 
 /* Some Bit ops for different operations */
-#define VPM150M_SPIRESET		0
 #define VPM150M_HPIRESET		1
 #define VPM150M_SWRESET			2
-#define VPM150M_DTMFDETECT		3
 #define VPM150M_ACTIVE			4
 
 #define NLPTYPE_NONE		0

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=9781&r1=9780&r2=9781
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Mon Feb 28 08:19:25 2011
@@ -479,18 +479,21 @@
 	/* Skip audio */
 	eframe += 24;
 
-	if (test_bit(VPM150M_SPIRESET, &vpmadt032->control) || test_bit(VPM150M_HPIRESET, &vpmadt032->control)) {
+	if (test_bit(VPM150M_HPIRESET, &vpmadt032->control)) {
 		if (debug & DEBUG_ECHOCAN)
 			dev_info(&wc->vb.pdev->dev, "HW Resetting VPMADT032...\n");
 		spin_lock_irqsave(&wc->reglock, flags);
 		for (x = 24; x < 28; x++) {
 			if (x == 24) {
-				if (test_and_clear_bit(VPM150M_SPIRESET, &vpmadt032->control))
-					eframe[CMD_BYTE(x, 0, 0)] = 0x08;
-				else if (test_and_clear_bit(VPM150M_HPIRESET, &vpmadt032->control))
+				if (test_and_clear_bit(VPM150M_HPIRESET,
+						       &vpmadt032->control)) {
 					eframe[CMD_BYTE(x, 0, 0)] = 0x0b;
-			} else
-				eframe[CMD_BYTE(x, 0, 0)] = 0x00 | leds;
+				} else {
+					eframe[CMD_BYTE(x, 0, 0)] = leds;
+				}
+			} else {
+				eframe[CMD_BYTE(x, 0, 0)] = leds;
+			}
 			eframe[CMD_BYTE(x, 1, 0)] = 0;
 			eframe[CMD_BYTE(x, 2, 0)] = 0x00;
 		}
@@ -4840,7 +4843,6 @@
 		remove_sysfs_files(wc);
 
 		if (vpm) {
-			clear_bit(VPM150M_DTMFDETECT, &vpm->control);
 			clear_bit(VPM150M_ACTIVE, &vpm->control);
 			flush_scheduled_work();
 		}

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=9781&r1=9780&r2=9781
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Mon Feb 28 08:19:25 2011
@@ -405,16 +405,19 @@
 	/* Skip audio */
 	eframe += 66;
 
-	if (test_bit(VPM150M_SPIRESET, &vpm->control) || test_bit(VPM150M_HPIRESET, &vpm->control)) {
+	if (test_bit(VPM150M_HPIRESET, &vpm->control)) {
 		debug_printk(wc, 1, "HW Resetting VPMADT032 ...\n");
 		for (x = 0; x < 4; x++) {
 			if (!x) {
-				if (test_and_clear_bit(VPM150M_SPIRESET, &vpm->control))
-					eframe[CMD_BYTE(x, 0, 1)] = 0x08;
-				else if (test_and_clear_bit(VPM150M_HPIRESET, &vpm->control))
-					eframe[CMD_BYTE(x, 0, 1)] = 0x0b;
-			} else
+				if (test_and_clear_bit(VPM150M_HPIRESET,
+						       &vpm->control)) {
+					eframe[CMD_BYTE(x, 0, 0)] = 0x0b;
+				} else {
+					eframe[CMD_BYTE(x, 0, 0)] = leds;
+				}
+			} else {
 				eframe[CMD_BYTE(x, 0, 1)] = 0x00 | leds;
+			}
 			eframe[CMD_BYTE(x, 1, 1)] = 0;
 			eframe[CMD_BYTE(x, 2, 1)] = 0x00;
 		}
@@ -2350,7 +2353,6 @@
 #ifdef VPM_SUPPORT
 	if(vpm) {
 		wc->vpmadt032 = NULL;
-		clear_bit(VPM150M_DTMFDETECT, &vpm->control);
 		clear_bit(VPM150M_ACTIVE, &vpm->control);
 		vpmadt032_free(vpm);
 	}