diff options
author | Shaun Ruffell <sruffell@digium.com> | 2009-07-21 14:56:49 +0000 |
---|---|---|
committer | Shaun Ruffell <sruffell@digium.com> | 2009-07-21 14:56:49 +0000 |
commit | 131eae4b7f1087e2a739ef799985875d6fdc2354 (patch) | |
tree | 56ba885bd6a50e1af77c4051db8bc69ac1610063 /drivers/dahdi/wcb4xxp | |
parent | 83ea6ab4c20c3b10815b2121d48d4251e762a733 (diff) |
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
Diffstat (limited to 'drivers/dahdi/wcb4xxp')
-rw-r--r-- | drivers/dahdi/wcb4xxp/base.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/dahdi/wcb4xxp/base.c b/drivers/dahdi/wcb4xxp/base.c index f5db389..1e05309 100644 --- a/drivers/dahdi/wcb4xxp/base.c +++ b/drivers/dahdi/wcb4xxp/base.c @@ -2,7 +2,7 @@ * WCB410P Quad-BRI PCI Driver * Written by Andrew Kohlsmith <akohlsmith@mixdown.ca> * - * Copyright (C) 2008 Digium, Inc. + * Copyright (C) 2009 Digium, Inc. * All rights reserved. * */ @@ -2486,6 +2486,11 @@ static int b4xxp_proc_read(char *buf, char **start, off_t offset, int count, int } #endif /* CREATE_WCB4XXP_PROCFS_ENTRY */ +static int b4xxp_startdefaultspan(struct b4xxp *b4) +{ + struct dahdi_lineconfig lc = {0,}; + return b4xxp_spanconfig(&b4->spans[0].span, &lc); +} static int __devinit b4xx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -2599,6 +2604,7 @@ static int __devinit b4xx_probe(struct pci_dev *pdev, const struct pci_device_id } + #if 0 /* Launch cards as appropriate */ for (;;) { @@ -2621,6 +2627,10 @@ static int __devinit b4xx_probe(struct pci_dev *pdev, const struct pci_device_id dev_info(b4->dev, "Did not do the highestorder stuff\n"); #endif + ret = b4xxp_startdefaultspan(b4); + if (ret) + goto err_out_unreg_spans; + ret = 0; return ret; |