[svn-commits] rmeyerriecks: branch linux/mspiceland/dahdi-qfalc31 r7705 - /linux/team/mspic...

[SVN commits to the Digium repositories]

Author: rmeyerriecks
Date: Wed Dec 16 18:10:50 2009
New Revision: 7705

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7705
Log:
wct4xxp: The merge from trunk modified the way span startups were handled.
Reworked the code so that as each span is brought online, the cards timing
sources are re-evaluated accordingly. DAHDI-339


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

Modified: linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c?view=diff&rev=7705&r1=7704&r2=7705
==============================================================================
--- linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/team/mspiceland/dahdi-qfalc31/drivers/dahdi/wct4xxp/base.c Wed Dec 16 18:10:50 2009
@@ -1783,7 +1783,7 @@
 	cmr1 |= (span << 6);
 	__t4_framer_out(wc, 0, 0x44, cmr1);
 
-	dev_dbg(&wc->dev->dev, "RCLK source set to span %d\n", span+1);
+	dev_info(&wc->dev->dev, "RCLK source set to span %d\n", span+1);
 }
 
 static void __t4_set_sclk_src(struct t4 *wc, int mode, int master, int slave)
@@ -1804,6 +1804,7 @@
 		wc->dmactrl &= ~(1 << 29);/* Provide timing from MCLK */
 
 	__t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
+	dev_info(&wc->dev->dev, "SCLK source (dmactrl) %#o\n", wc->dmactrl);
 }
 
 static void __t4_set_timing_source(struct t4 *wc, int unit, int master, int slave)
@@ -1946,7 +1947,7 @@
 	if (timingcable) {
 		__t4_findsync(wc);
 	} else {
-		printk(KERN_DEBUG "Evaluating spans for timing sources:\n");
+		dev_info(&wc->dev->dev, "Evaluating spans for timing source\n");
 		for (x=0;x<wc->numspans;x++) {
 			if ((wc->tspans[x]->span.flags & DAHDI_FLAG_RUNNING) &&
 			   !(wc->tspans[x]->span.alarms & (DAHDI_ALARM_RED |
@@ -2209,8 +2210,9 @@
 			DAHDI_LIN2X(0,span->chans[i]),DAHDI_CHUNKSIZE);
 	}
 #endif
-	/* Force re-evaluation fo timing source */
+	/* Force re-evaluation of timing source */
 	wc->syncsrc = -1;
+	set_bit(T4_CHECK_TIMING, &wc->checkflag);
 
 	if (ts->spantype == TYPE_E1) { /* if this is an E1 card */
 		__t4_configure_e1(wc, span->offset, span->lineconfig);