[svn-commits] sruffell: branch linux/sruffell/dahdi-linux-debugfs r7546 - in /linux/team/sr...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Nov 10 09:30:04 2009
New Revision: 7546

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7546
Log:
wcte12xp, wdtdm24xxp: We do not need to poll for DTMF anymore.

Modified:
    linux/team/sruffell/dahdi-linux-debugfs/drivers/dahdi/wctdm24xxp/base.c
    linux/team/sruffell/dahdi-linux-debugfs/drivers/dahdi/wcte12xp/base.c

Modified: linux/team/sruffell/dahdi-linux-debugfs/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/dahdi-linux-debugfs/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=7546&r1=7545&r2=7546
==============================================================================
--- linux/team/sruffell/dahdi-linux-debugfs/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/team/sruffell/dahdi-linux-debugfs/drivers/dahdi/wctdm24xxp/base.c Tue Nov 10 09:30:04 2009
@@ -457,7 +457,7 @@
 }
 
 
-static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *writechunk, int whichframe)
+static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *writechunk)
 {
 	struct vpmadt032_cmd *curcmd = NULL;
 	struct vpmadt032 *vpmadt032 = wc->vpmadt032;
@@ -561,11 +561,6 @@
 	/* Add our leds in */
 	for (x = 24; x < 28; x++) {
 		writechunk[CMD_BYTE(x, 0, 0)] |= leds;
-	}
-
-	/* Now let's figure out if we need to check for DTMF */
-	if (test_bit(VPM150M_ACTIVE, &vpmadt032->control) && !whichframe && !(wc->intcount % 100)) {
-		schedule_work(&vpmadt032->work);
 	}
 }
 
@@ -859,7 +854,7 @@
 			}
 #endif			
 		} else if (wc->vpmadt032) {
-			cmd_dequeue_vpmadt032(wc, writechunk, x);
+			cmd_dequeue_vpmadt032(wc, writechunk);
 		}
 
 		if (x < DAHDI_CHUNKSIZE - 1) {

Modified: linux/team/sruffell/dahdi-linux-debugfs/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/dahdi-linux-debugfs/drivers/dahdi/wcte12xp/base.c?view=diff&rev=7546&r1=7545&r2=7546
==============================================================================
--- linux/team/sruffell/dahdi-linux-debugfs/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/team/sruffell/dahdi-linux-debugfs/drivers/dahdi/wcte12xp/base.c Tue Nov 10 09:30:04 2009
@@ -383,7 +383,7 @@
 	return 0;
 }
 
-static void cmd_dequeue_vpmadt032(struct t1 *wc, unsigned char *writechunk, int whichframe)
+static void cmd_dequeue_vpmadt032(struct t1 *wc, unsigned char *writechunk)
 {
 	struct vpmadt032_cmd *cmd;
 	struct vpmadt032 *vpm = wc->vpmadt032;
@@ -528,11 +528,6 @@
 		}
 	}
 #endif
-
-	/* Now let's figure out if we need to check for DTMF */
-	/* polling */
-	if (test_bit(VPM150M_ACTIVE, &vpm->control) && !whichframe && !(atomic_read(&wc->txints) % 100))
-		schedule_work(&vpm->work);
 
 #if 0
 	/* This may be needed sometime in the future to troubleshoot ADT related issues. */
@@ -1634,7 +1629,7 @@
 #ifdef VPM_SUPPORT
 		if(likely(wc->vpmadt032)) {
 			spin_lock(&wc->reglock);
-			cmd_dequeue_vpmadt032(wc, writechunk, x);
+			cmd_dequeue_vpmadt032(wc, writechunk);
 			spin_unlock(&wc->reglock);
 		}
 #endif