From 78c015ad276be368cc19e50c6d7a9754c0758c00 Mon Sep 17 00:00:00 2001 From: tzafrir Date: Wed, 6 Sep 2006 08:24:41 +0000 Subject: Cleanup the unused non-RBS code: * remove all non WITH_RBS code. No need for the define. * unused recv_errors and seq_errors. * CID_START_TICKS, CID_STOP_TICKS cid_timer from trunk/ git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1411 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- xpp/xpp_zap.c | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'xpp/xpp_zap.c') diff --git a/xpp/xpp_zap.c b/xpp/xpp_zap.c index 698ef2a..ffb8934 100644 --- a/xpp/xpp_zap.c +++ b/xpp/xpp_zap.c @@ -1137,7 +1137,6 @@ int xpp_ioctl(struct zt_chan *chan, unsigned int cmd, unsigned long arg) return 0; } -#ifdef WITH_RBS static int xpp_hooksig(struct zt_chan *chan, zt_txsig_t txsig) { xpd_t *xpd = chan->pvt; @@ -1151,24 +1150,6 @@ static int xpp_hooksig(struct zt_chan *chan, zt_txsig_t txsig) return CALL_XMETHOD(card_hooksig, xbus, xpd, pos, txsig); } -#else - -static int xpp_sethook(struct zt_chan *chan, int hookstate) -{ - int pos = chan->chanpos - 1; - xpd_t *xpd = chan->pvt; - xbus_t *xbus; - int ret = 0; - - BUG_ON(!xpd); - xbus = xpd->xbus; - DBG("%s (%d) (old=0x%04X, hook-command=%d)\n", chan->name, pos, xpd->offhook, hookstate); - ret = CALL_XMETHOD(card_sethook, xpd->xbus, xpd, pos, hookstate); - return ret; -} - -#endif - /* Req: Set the requested chunk size. This is the unit in which you must report results for conferencing, etc */ int xpp_setchunksize(struct zt_span *span, int chunksize); @@ -1361,12 +1342,8 @@ static int zaptel_register_xpd(xpd_t *xpd) span->chanconfig = xpp_chanconfig; span->open = xpp_open; span->close = xpp_close; -#ifdef WITH_RBS span->flags = ZT_FLAG_RBS; span->hooksig = xpp_hooksig; /* Only with RBS bits */ -#else - span->sethook = xpp_sethook; -#endif span->ioctl = xpp_ioctl; span->maint = xpp_maint; #ifdef XPP_EC_CHUNK @@ -1424,11 +1401,6 @@ int __init xpp_zap_init(void) INFO("%s revision %s MAX_XPDS=%d\n", THIS_MODULE->name, ZAPTEL_VERSION, MAX_XPDS); -#ifdef WITH_RBS - INFO("FEATURE: %s (RBS signalling)\n", THIS_MODULE->name); -#else - INFO("FEATURE: %s (NO RBS signalling)\n", THIS_MODULE->name); -#endif #if WITH_ECHO_SUPPRESSION INFO("FEATURE: %s (with ECHO_SUPPRESSION)\n", THIS_MODULE->name); #else -- cgit v1.2.3