[svn-commits] sruffell: linux/trunk r9946 - /linux/trunk/drivers/dahdi/wcte12xp/base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Jun  2 15:02:03 2011
New Revision: 9946

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9946
Log:
wcte12xp: Move the VPMADT032 test/configuration to module load time.

The firmware load of the VPMADT032 was moved to startspan because a
quad-span card in the same system would would lock interrupts for
several seconds to load VPMOCT064/128 firmware. Now that the wct4xxp
driver no longer locks interrupts while loading its VPM module this
driver can move the VPMADT032 check/load back to module load time.

This is also required so that the presence of a hardware echo canceler
is marked on the span before it is registered with dahdi-base.c.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Modified:
    linux/trunk/drivers/dahdi/wcte12xp/base.c

Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=9946&r1=9945&r2=9946
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Thu Jun  2 15:02:03 2011
@@ -72,7 +72,6 @@
 
 static void echocan_free(struct dahdi_chan *chan, struct dahdi_echocan_state *ec);
 static int t1xxp_clear_maint(struct dahdi_span *span);
-static int check_and_load_vpm(struct t1 *wc);
 
 static const struct dahdi_echocan_features vpm150m_ec_features = {
 	.NLP_automatic = 1,
@@ -935,7 +934,6 @@
 	unsigned int i;
 #endif
 
-	check_and_load_vpm(wc);
 	set_span_devicetype(wc);
 
 #ifndef CONFIG_VOICEBUS_ECREFERENCE
@@ -1605,6 +1603,9 @@
 		wc->chans[x]->pvt = wc;
 		wc->chans[x]->chanpos = x + 1;
 	}
+
+	check_and_load_vpm(wc);
+
 	wc->span.ops = &t1_span_ops;
 	if (dahdi_register(&wc->span, 0)) {
 		t1_info(wc, "Unable to register span with DAHDI\n");