[svn-commits] mspiceland: branch linux/2.3 r8830 - in /linux/branches/2.3: ./ drivers/dahdi...

[SVN commits to the Digium repositories]

Author: mspiceland
Date: Tue Jun 29 14:32:35 2010
New Revision: 8830

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8830
Log:
Merged revisions 8801,8805 via svnmerge from 
https://origsvn.digium.com/svn/dahdi/linux/trunk

........
  r8801 | mspiceland | 2010-06-24 11:13:44 -0500 (Thu, 24 Jun 2010) | 4 lines
  
  Impliments a workaround for an errata in the qfalc v3.1 chip which caused
  RBS modes to be broken when using AMI coding.  DAHDI-647.
........
  r8805 | mspiceland | 2010-06-24 16:02:56 -0500 (Thu, 24 Jun 2010) | 2 lines
  
  Fix trailing whitespace and make last change more readible. (sruffell suggestion)
........

Modified:
    linux/branches/2.3/   (props changed)
    linux/branches/2.3/drivers/dahdi/wct4xxp/base.c

Propchange: linux/branches/2.3/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 29 14:32:35 2010
@@ -1,1 +1,1 @@
-/linux/trunk:1-8505,8538-8539,8550,8560-8563,8565-8568,8570-8572,8575-8576,8674,8784
+/linux/trunk:1-8505,8538-8539,8550,8560-8563,8565-8568,8570-8572,8575-8576,8674,8784,8801-8805

Modified: linux/branches/2.3/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.3/drivers/dahdi/wct4xxp/base.c?view=diff&rev=8830&r1=8829&r2=8830
==============================================================================
--- linux/branches/2.3/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/branches/2.3/drivers/dahdi/wct4xxp/base.c Tue Jun 29 14:32:35 2010
@@ -2204,7 +2204,8 @@
 	/* Configure line interface */
 	if (lineconfig & DAHDI_CONFIG_AMI) {
 		line = "AMI";
-		fmr0 = 0xa0;
+		/* workaround for errata #2 in ES v3 09-10-16 */
+		fmr0 = (wc->falc31) ? 0xb0 : 0xa0;
 	} else {
 		line = "B8ZS";
 		fmr0 = 0xf0;
@@ -2296,7 +2297,8 @@
 	/* Configure line interface */
 	if (lineconfig & DAHDI_CONFIG_AMI) {
 		line = "AMI";
-		fmr0 = 0xa0;
+		/* workaround for errata #2 in ES v3 09-10-16 */
+		fmr0 = (wc->falc31) ? 0xb0 : 0xa0;
 	} else {
 		line = "HDB3";
 		fmr0 = 0xf0;