[svn-commits] mspiceland: branch linux/mspiceland/dahdi-qfalc31 r7051 - /linux/team/mspicel...

[SVN commits to the Digium repositories]

Author: mspiceland
Date: Fri Aug 21 09:25:54 2009
New Revision: 7051

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=7051
Log:
qfalc v2.1's ability to auto send yellow alarm was broken.  For this reason, 
we've been manually sending yellow alarm via FRM4.XRA.  On the qfalc v3.1,
the auto mode is now fixed.  Unfortunately, there is a bug where the 
manual sending of yellow alarm can get stuck.  For this reason, we now
rely on the auto sending of yellow alarm but no longer manually send
yellow alarm for v3.1 chips.

Modified:
    linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c

Modified: linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c?view=diff&rev=7051&r1=7050&r2=7051
==============================================================================
--- linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c Fri Aug 21 09:25:54 2009
@@ -2573,7 +2573,7 @@
 		alarms |= DAHDI_ALARM_RECOVER;
 
 	/* If receiving alarms, go into Yellow alarm state */
-	if (alarms && !(ts->spanflags & FLAG_SENDINGYELLOW)) {
+	if (!(wc->falc31) && alarms && !(ts->spanflags & FLAG_SENDINGYELLOW)) {
 		unsigned char fmr4;
 #if 1
 		printk(KERN_INFO "wct%dxxp: Setting yellow alarm on span %d\n", wc->numspans, span + 1);
@@ -2582,7 +2582,7 @@
 		fmr4 = __t4_framer_in(wc, span, 0x20);
 		__t4_framer_out(wc, span, 0x20, fmr4 | 0x20);
 		ts->spanflags |= FLAG_SENDINGYELLOW;
-	} else if ((!alarms) && (ts->spanflags & FLAG_SENDINGYELLOW)) {
+	} else if (!(wc->falc31) && (!alarms) && (ts->spanflags & FLAG_SENDINGYELLOW)) {
 		unsigned char fmr4;
 #if 1
 		printk(KERN_INFO "wct%dxxp: Clearing yellow alarm on span %d\n", wc->numspans, span + 1);