From 131eae4b7f1087e2a739ef799985875d6fdc2354 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Tue, 21 Jul 2009 14:56:49 +0000 Subject: Merged revisions 6712,6776,6799,6801,6803 via svnmerge from https://origsvn.digium.com/svn/dahdi/linux/trunk ........ r6712 | sruffell | 2009-06-24 14:13:35 -0500 (Wed, 24 Jun 2009) | 4 lines wct4xxp, wcte11xp: Use the default configuration by default at startup. This change allows hardware to provide timing to asterisk before normal configuration. DAHDI-275. ........ r6776 | sruffell | 2009-06-26 16:24:34 -0500 (Fri, 26 Jun 2009) | 4 lines voicebus: Limit the string length of the vpm workqueue name. On older kernels, it is possible to cause a kernel panic if the lenght of the workqueue name is greater than 10. DAHDI-276. ........ r6799 | sruffell | 2009-06-30 10:45:06 -0500 (Tue, 30 Jun 2009) | 5 lines wcb4xxp: Start the first span with default settings on load. One of the spans of the B410P is now started at driver load time in order to allow it to provide early timing to asterisk, before the card has been properly configured. ........ r6801 | sruffell | 2009-06-30 12:17:09 -0500 (Tue, 30 Jun 2009) | 5 lines echocan: Do not call through NULL 'echocan_traintap' pointer. This resolves an issue with a kernel panic if echotraining is enabled in the Asterisk configuration file, but the echocan on the channel (which may be a hardware echocanceller) has not defined that operation. DAHDI-272. ........ r6803 | sruffell | 2009-06-30 12:27:34 -0500 (Tue, 30 Jun 2009) | 1 line echocan: Do not go into PRETRAINING mode if not supported by the echocan. ........ git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.2@6860 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wct4xxp/base.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'drivers/dahdi/wct4xxp') diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index 96fabde..6558de8 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -6,7 +6,7 @@ * written by Jim Dixon . * * Copyright (C) 2001 Jim Dixon / Zapata Telephony. - * Copyright (C) 2001-2005, Digium, Inc. + * Copyright (C) 2001-2009, Digium, Inc. * * All rights reserved. * @@ -3547,6 +3547,12 @@ static int __devinit t4_launch(struct t4 *wc) __t4_set_timing_source(wc,4, 0, 0); spin_unlock_irqrestore(&wc->reglock, flags); tasklet_init(&wc->t4_tlet, t4_isr_bh, (unsigned long)wc); + + /* Start the first span on the card with the default configuration so + * that it may provide timing to Asterisk before being properly + * configured. */ + t4_startup(&wc->tspans[0]->span); + return 0; } -- cgit v1.2.3