[svn-commits] sruffell: branch linux/2.5 r10150 - /linux/branches/2.5/drivers/dahdi/wctdm24...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Aug 19 17:53:51 2011
New Revision: 10150

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10150
Log:
wctdm24xxp: Set 'fastoffhook' counter to 8ms and turn off calibration delay.

r10006 "wctdm24xxp: Add 'fastpick' module parameter." copied the
fast-off hook module parameter from the wctdm.c driver, but the setting
in that driver does not match the data sheet. The previous commit did
not actually change any of the significant bits in that register. Also,
that commit changed the timer, but did not disable the callibration
delay which is necessary for Type-II callerid.

The fastpickup option in the wctdm24xxp driver should now match the
fastpickup option in the wctdm driver.

DAHDI-224.

Reported-By: Kinnith Wallace <kwallace at digium.com>
Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10148

Modified:
    linux/branches/2.5/drivers/dahdi/wctdm24xxp/base.c

Modified: linux/branches/2.5/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.5/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=10150&r1=10149&r2=10150
==============================================================================
--- linux/branches/2.5/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/branches/2.5/drivers/dahdi/wctdm24xxp/base.c Fri Aug 19 17:53:51 2011
@@ -2876,7 +2876,10 @@
 	wctdm_setreg(wc, mod, 30, reg30);
 
 	/* Misc. DAA parameters */
-	reg31 = (fastpickup) ? 0xb3 : 0xa3;
+
+	/* If fast pickup is set, then the off hook counter will be set to 8
+	 * ms, otherwise 128 ms. */
+	reg31 = (fastpickup) ? 0xe3 : 0xa3;
 
 	reg31 |= (fxo_modes[_opermode].ohs2 << 3);
 	wctdm_setreg(wc, mod, 31, reg31);
@@ -2885,6 +2888,10 @@
 
 	/* Enable ISO-Cap */
 	wctdm_setreg(wc, mod, 6, 0x00);
+
+	/* Turn off the calibration delay when fastpickup is enabled. */
+	if (fastpickup)
+		wctdm_setreg(wc, mod, 17, wctdm_getreg(wc, mod, 17) | 0x20);
 
 	/* Wait 1000ms for ISO-cap to come up */
 	newjiffies = jiffies;