summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Spiceland <mspiceland@digium.com>2010-06-29 19:32:35 +0000
committerMike Spiceland <mspiceland@digium.com>2010-06-29 19:32:35 +0000
commita413962447fb1c39819a85b339bffe96c7a6c568 (patch)
tree7a5138f47f420f5eff6713c401f3e90c86efda04
parentc083a2fd217df6b516dbf7c929a46954bcd6dd11 (diff)
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) ........ git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.3@8830 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/wct4xxp/base.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c
index 33ce3f5..91df22d 100644
--- a/drivers/dahdi/wct4xxp/base.c
+++ b/drivers/dahdi/wct4xxp/base.c
@@ -2204,7 +2204,8 @@ static void __t4_configure_t1(struct t4 *wc, int unit, int lineconfig, int txlev
/* 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 @@ static void __t4_configure_e1(struct t4 *wc, int unit, int lineconfig)
/* 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;