diff options
| author | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-11 21:16:47 +0000 |
|---|---|---|
| committer | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-11 21:16:47 +0000 |
| commit | 6f080bd132a29bdef1b60765b521a12d6bfb58ad (patch) | |
| tree | 0c05115bb8209543c643539c8ca8851ee08ec1ad /kernel | |
| parent | 0ecae3e7460d4520882e8c73fad31326ff91a9b9 (diff) | |
Make sure that we disable the echo canceller on the old style echocan() function even if parameters are passed in.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4169 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/wct4xxp/vpm450m.c | 4 | ||||
| -rw-r--r-- | kernel/zaptel-base.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/kernel/wct4xxp/vpm450m.c b/kernel/wct4xxp/vpm450m.c index 674dd49..3fe11f6 100644 --- a/kernel/wct4xxp/vpm450m.c +++ b/kernel/wct4xxp/vpm450m.c @@ -491,6 +491,7 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f * stack unfriendly. Stupid, stupid, stupid. So we disable IRQs so we * don't run the risk of overflowing the stack while we initialize the * octasic. */ + printk("Loading firmware\n"); #ifdef CONFIG_4KSTACKS local_irq_save(flags); #endif @@ -505,6 +506,8 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f kfree(ChannelOpen); return NULL; } + //schedule(); + printk("Firmware loaded\n"); for (x=0;x<128;x++) { /* execute this loop always on 4 span cards but * on 2 span cards only execute for the channels related to our spans */ @@ -553,6 +556,7 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f } } } + printk("Channels configured\n"); #ifdef CONFIG_4KSTACKS local_irq_restore(flags); diff --git a/kernel/zaptel-base.c b/kernel/zaptel-base.c index 59d08e4..bceeb43 100644 --- a/kernel/zaptel-base.c +++ b/kernel/zaptel-base.c @@ -4644,7 +4644,7 @@ static int ioctl_echocancel(struct zt_chan *chan, struct zt_echocanparams *ecp, if (chan->span) { if (chan->span->echocan_with_params) ret = chan->span->echocan_with_params(chan, ecp, params); - else if (!ecp->param_count && chan->span->echocan) + else if (chan->span->echocan) ret = chan->span->echocan(chan, ecp->tap_length); } |