diff options
| author | Kinsey Moore <kmoore@digium.com> | 2010-12-09 20:19:16 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2010-12-09 20:19:16 +0000 |
| commit | ec560798ddeb9094774eec53207f38928a636d84 (patch) | |
| tree | ddd307f4b2b96bf22760123dcae04a6a56b1765a /drivers | |
| parent | 4f635abcbc19be2a40a56f96299cbd5210318d8e (diff) | |
dahdi-base: Remove old method of invoking HWEC
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index c7a346a..9dd829c 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -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)) { |