FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi-base: Remove old method of invoking HWEC

Browse Source 
Remove the code that allowed hardware echo cancellation to automatically
override software cancellation and prevented SWEC from working at all on a
card if HWEC was installed.  All EC now uses the standard modular EC interface.
Additionally, the "SWEC" identifier on channel lines in /proc/dahdi has been
changed to "ECTYPE" to avoid confusion.

Signed-off-by: Kinsey Moore <kmoore@digium.com>
Acked-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9521 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Kinsey Moore
2010-12-09 20:19:16 +00:00
parent 6140d43665
commit fbee540bf5
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/dahdi/dahdi-base.c
View File

@@ -573,17 +573,6 @@ static void dahdi_disable_dacs(struct dahdi_chan *chan)
dahdi_chan_dacs(chan, NULL);
}
static int dahdi_chan_echocan_create(struct dahdi_chan *chan,
struct dahdi_echocanparams *ecp,
struct dahdi_echocanparam *p,
struct dahdi_echocan_state **ec)
{
if (chan->span && chan->span->ops->echocan_create)
return chan->span->ops->echocan_create(chan, ecp, p, ec);
else
return -ENODEV;
}
/*!
* \return quiescent (idle) signalling states, for the various signalling types
*/
@@ -812,7 +801,7 @@ static int dahdi_proc_read(char *page, char **start, off_t off, int count, int *
chan->chan_alarms);
if (chan->ec_factory)
len += snprintf(page+len, count-len, "(SWEC: %s) ",
len += snprintf(page+len, count-len, "(ECTYPE: %s) ",
chan->ec_factory->name);
if (chan->ec_state)
@@ -5430,7 +5419,7 @@ ioctl_echocancel(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp,
struct dahdi_echocan_state *ec = NULL, *ec_state;
const struct dahdi_echocan_factory *ec_current;
struct dahdi_echocanparam *params;
int ret;
int ret = 0;
unsigned long flags;
if (ecp->param_count > DAHDI_MAX_ECHOCANPARAMS)
@@ -5491,11 +5480,7 @@ ioctl_echocancel(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp,
ec_current = NULL;
/* attempt to use the span's echo canceler; fall back to built-in
if it fails (but not if an error occurs) */
ret = dahdi_chan_echocan_create(chan, ecp, params, &ec);
if ((ret == -ENODEV) && chan->ec_factory) {
if (chan->ec_factory) {
/* try to get another reference to the module providing
this channel's echo canceler */
if (!try_module_get(chan->ec_factory->owner)) {