diff options
author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-06-25 08:35:14 +0000 |
---|---|---|
committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-06-25 08:35:14 +0000 |
commit | 235e35d99eea9815d1580efa314e0d884caf0ce6 (patch) | |
tree | 1e6b47c07a3bf3ad0b7888c064d60ff2bc91bd88 /drivers | |
parent | 3d7aacdbe9144fe51b4b13c5edea5c4325003de5 (diff) |
Removed some old, unused XPP code.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4457 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/dahdi/xpp/Kbuild | 1 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xbus-pcm.c | 71 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xbus-pcm.h | 7 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.c | 2 |
4 files changed, 1 insertions, 80 deletions
diff --git a/drivers/dahdi/xpp/Kbuild b/drivers/dahdi/xpp/Kbuild index 52c095b..8eff5a2 100644 --- a/drivers/dahdi/xpp/Kbuild +++ b/drivers/dahdi/xpp/Kbuild @@ -1,7 +1,6 @@ EXTRA_CFLAGS = $(XPP_LOCAL_CFLAGS) \ -DDEBUG \ -DPOLL_DIGITAL_INPUTS \ - -DWITH_ECHO_SUPPRESSION \ -DDEBUG_PCMTX \ -DPROTOCOL_DEBUG \ -g diff --git a/drivers/dahdi/xpp/xbus-pcm.c b/drivers/dahdi/xpp/xbus-pcm.c index 5f6ed8d..1e3a915 100644 --- a/drivers/dahdi/xpp/xbus-pcm.c +++ b/drivers/dahdi/xpp/xbus-pcm.c @@ -36,10 +36,6 @@ static const char rcsid[] = "$Id$"; extern int debug; -#ifdef XPP_EC_CHUNK -#include "supress/ec_xpp.h" -DEF_PARM_BOOL(xpp_ec, 0, 0444, "Do we use our own (1) or Dahdi's (0) echo canceller"); -#endif #ifdef OPTIMIZE_CHANMUTE static DEF_PARM_BOOL(optimize_chanmute, 1, 0644, "Optimize by muting inactive channels"); #endif @@ -650,52 +646,20 @@ void fill_beep(u_char *buf, int num, int duration) memcpy(buf, snd, DAHDI_CHUNKSIZE); } -#ifdef XPP_EC_CHUNK -/* - * Taken from dahdi.c - */ -static inline void xpp_ec_chunk(struct dahdi_chan *chan, unsigned char *rxchunk, const unsigned char *txchunk) -{ - int16_t rxlin; - int x; - unsigned long flags; - - /* Perform echo cancellation on a chunk if necessary */ - if (!chan->ec) - return; - spin_lock_irqsave(&chan->lock, flags); - for (x=0;x<DAHDI_CHUNKSIZE;x++) { - rxlin = DAHDI_XLAW(rxchunk[x], chan); - rxlin = xpp_echo_can_update(chan->ec, DAHDI_XLAW(txchunk[x], chan), rxlin); - rxchunk[x] = DAHDI_LIN2X((int)rxlin, chan); - } - spin_unlock_irqrestore(&chan->lock, flags); -} -#endif - static void do_ec(xpd_t *xpd) { -#ifdef WITH_ECHO_SUPPRESSION struct dahdi_chan *chans = xpd->span.chans; int i; - /* FIXME: need to Echo cancel double buffered data */ for (i = 0;i < xpd->span.channels; i++) { if(unlikely(IS_SET(xpd->digital_signalling, i))) /* Don't echo cancel BRI D-chans */ continue; if(!IS_SET(xpd->wanted_pcm_mask, i)) /* No ec for unwanted PCM */ continue; -#ifdef XPP_EC_CHUNK - /* even if defined, parameterr xpp_ec can override at run-time */ - if (xpp_ec) - xpp_ec_chunk(&chans[i], chans[i].readchunk, xpd->ec_chunk2[i]); - else -#endif - dahdi_ec_chunk(&chans[i], chans[i].readchunk, xpd->ec_chunk2[i]); + dahdi_ec_chunk(&chans[i], chans[i].readchunk, xpd->ec_chunk2[i]); memcpy(xpd->ec_chunk2[i], xpd->ec_chunk1[i], DAHDI_CHUNKSIZE); memcpy(xpd->ec_chunk1[i], chans[i].writechunk, DAHDI_CHUNKSIZE); } -#endif } #if 0 @@ -720,29 +684,6 @@ int (*hooksig)(struct dahdi_chan *chan, dahdi_txsig_t hookstate); int (*sethook)(struct dahdi_chan *chan, int hookstate); #endif -int xpp_echocan(struct dahdi_chan *chan, int len) -{ -#ifdef XPP_EC_CHUNK - if(len == 0) { /* shut down */ - /* dahdi calls this also during channel initialization */ - if(chan->ec) { - xpp_echo_can_free(chan->ec); - } - return 0; - } - if(chan->ec) { - ERR("%s: Trying to override an existing EC (%p)\n", __FUNCTION__, chan->ec); - return -EINVAL; - } - chan->ec = xpp_echo_can_create(len, 0); - if(!chan->ec) { - ERR("%s: Failed creating xpp EC (len=%d)\n", __FUNCTION__, len); - return -EINVAL; - } -#endif - return 0; -} - static bool pcm_valid(xpd_t *xpd, xpacket_t *pack) { xpp_line_t lines = RPACKET_FIELD(pack, GLOBAL, PCM_READ, lines); @@ -1245,15 +1186,6 @@ int xbus_pcm_init(struct proc_dir_entry *toplevel) INFO("FEATURE: with CHANMUTE optimization (%sactivated)\n", (optimize_chanmute)?"":"de"); #endif -#ifdef WITH_ECHO_SUPPRESSION - INFO("FEATURE: with ECHO_SUPPRESSION\n"); -#else - INFO("FEATURE: without ECHO_SUPPRESSION\n"); -#endif - if(xpp_ec) - INFO("FEATURE: with XPP_EC_CHUNK\n"); - else - INFO("FEATURE: without XPP_EC_CHUNK\n"); #ifdef DAHDI_SYNC_TICK INFO("FEATURE: with sync_tick() from DAHDI\n"); #else @@ -1288,7 +1220,6 @@ void xbus_pcm_shutdown(void) EXPORT_SYMBOL(xbus_request_sync); EXPORT_SYMBOL(got_new_syncer); EXPORT_SYMBOL(elect_syncer); -EXPORT_SYMBOL(xpp_echocan); #ifdef DAHDI_SYNC_TICK EXPORT_SYMBOL(dahdi_sync_tick); #endif diff --git a/drivers/dahdi/xpp/xbus-pcm.h b/drivers/dahdi/xpp/xbus-pcm.h index 3995bdc..a7529c8 100644 --- a/drivers/dahdi/xpp/xbus-pcm.h +++ b/drivers/dahdi/xpp/xbus-pcm.h @@ -112,17 +112,10 @@ void got_new_syncer(xbus_t *xbus, enum sync_mode mode, int drift); int xbus_command_queue_tick(xbus_t *xbus); void xbus_reset_counters(xbus_t *xbus); void elect_syncer(const char *msg); -int xpp_echocan(struct dahdi_chan *chan, int len); #ifdef DAHDI_SYNC_TICK int dahdi_sync_tick(struct dahdi_span *span, int is_master); #endif -#ifdef XPP_EC_CHUNK -extern int xpp_ec; -#else -#define xpp_ec 0 -#endif - #ifdef DEBUG_PCMTX extern int pcmtx; extern int pcmtx_chan; diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index 8ee23f7..ae8e381 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -955,8 +955,6 @@ static int dahdi_register_xpd(xpd_t *xpd) #ifdef DAHDI_SYNC_TICK span->sync_tick = dahdi_sync_tick; #endif - if (xpp_ec) - span->echocan = xpp_echocan; #ifdef CONFIG_DAHDI_WATCHDOG span->watchdog = xpp_watchdog; #endif |