[svn-commits] kpfleming: branch 1.4 r125132 - in /branches/1.4: ./ apps/ channels/ include/...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Jun 25 17:21:31 CDT 2008
Author: kpfleming
Date: Wed Jun 25 17:21:30 2008
New Revision: 125132
URL: http://svn.digium.com/view/asterisk?view=rev&rev=125132
Log:
allow tonezone to live in a different place than DAHDI/Zaptel, since dahdi-tools and dahdi-linux are now separate packages and can be installed in different places
don't include tonezone.h in dahdi_compat.h, because only a couple of modules need it
get app_rpt building again after the DAHDI changes
(closes issue #12911)
Reported by: tzafrir
Added:
branches/1.4/include/asterisk/tonezone_compat.h
- copied, changed from r125130, branches/1.4/include/asterisk/dahdi_compat.h
Modified:
branches/1.4/apps/app_rpt.c
branches/1.4/channels/chan_dahdi.c
branches/1.4/configure
branches/1.4/configure.ac
branches/1.4/include/asterisk/dahdi_compat.h
Modified: branches/1.4/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_rpt.c?view=diff&rev=125132&r1=125131&r2=125132
==============================================================================
--- branches/1.4/apps/app_rpt.c (original)
+++ branches/1.4/apps/app_rpt.c Wed Jun 25 17:21:30 2008
@@ -137,7 +137,7 @@
*/
/*** MODULEINFO
- <depend>zaptel</depend>
+ <depend>dahdi</depend>
<depend>tonezone</depend>
<defaultenabled>no</defaultenabled>
***/
@@ -276,15 +276,9 @@
#include <sys/io.h>
#include <sys/vfs.h>
#include <math.h>
-#ifdef OLD_ASTERISK
-#include <linux/zaptel.h>
-#include <tonezone.h>
-#else
-#include <zaptel/zaptel.h>
-#include <zaptel/tonezone.h>
-#endif
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <termios.h>
#include "asterisk/utils.h"
#include "asterisk/lock.h"
@@ -303,7 +297,9 @@
#include "asterisk/localtime.h"
#include "asterisk/cdr.h"
#include "asterisk/options.h"
-#include <termios.h>
+
+#include "asterisk/dahdi_compat.h"
+#include "asterisk/tonezone_compat.h"
/* Start a tone-list going */
int ast_playtones_start(struct ast_channel *chan, int vol, const char* tonelist, int interruptible);
@@ -2609,7 +2605,7 @@
*/
for(i = 0; i < 20 ; i++){
- flags = DAHDI_IOMUX_WRITEEMPTY | ZT_IOMUX_NOWAIT;
+ flags = DAHDI_IOMUX_WRITEEMPTY | DAHDI_IOMUX_NOWAIT;
res = ioctl(chan->fds[0], DAHDI_IOMUX, &flags);
if(flags & DAHDI_IOMUX_WRITEEMPTY)
break;
@@ -2660,7 +2656,7 @@
*/
for(i = 0; i < 20 ; i++){
- flags = DAHDI_IOMUX_WRITEEMPTY | ZT_IOMUX_NOWAIT;
+ flags = DAHDI_IOMUX_WRITEEMPTY | DAHDI_IOMUX_NOWAIT;
res = ioctl(chan->fds[0], DAHDI_IOMUX, &flags);
if(flags & DAHDI_IOMUX_WRITEEMPTY)
break;
@@ -2920,7 +2916,7 @@
int i,ns,rbimode;
char mhz[MAXREMSTR];
char decimals[MAXREMSTR];
-struct zt_params par;
+struct dahdi_params par;
/* get a pointer to myrpt */
@@ -4181,8 +4177,8 @@
#endif
ci.chan = 0;
ci.confno = myrpt->conf; /* use the pseudo conference */
- ci.confmode = DAHDI_CONF_REALANDPSEUDO | ZT_CONF_TALKER | ZT_CONF_LISTENER
- | DAHDI_CONF_PSEUDO_TALKER | ZT_CONF_PSEUDO_LISTENER;
+ ci.confmode = DAHDI_CONF_REALANDPSEUDO | DAHDI_CONF_TALKER | DAHDI_CONF_LISTENER
+ | DAHDI_CONF_PSEUDO_TALKER | DAHDI_CONF_PSEUDO_LISTENER;
/* first put the channel on the conference */
if (ioctl(mychannel->fds[0],DAHDI_SETCONF,&ci) == -1)
{
@@ -4204,8 +4200,8 @@
#endif
ci.chan = 0;
ci.confno = myrpt->conf;
- ci.confmode = DAHDI_CONF_REALANDPSEUDO | ZT_CONF_TALKER | ZT_CONF_LISTENER
- | DAHDI_CONF_PSEUDO_TALKER | ZT_CONF_PSEUDO_LISTENER;
+ ci.confmode = DAHDI_CONF_REALANDPSEUDO | DAHDI_CONF_TALKER | DAHDI_CONF_LISTENER
+ | DAHDI_CONF_PSEUDO_TALKER | DAHDI_CONF_PSEUDO_LISTENER;
/* first put the channel on the conference */
if (ioctl(genchannel->fds[0],DAHDI_SETCONF,&ci) == -1)
{
@@ -4347,7 +4343,7 @@
ci.chan = 0;
ci.confno = myrpt->conf;
ci.confmode = (myrpt->p.duplex == 2) ? DAHDI_CONF_CONFANNMON :
- (DAHDI_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER);
+ (DAHDI_CONF_CONF | DAHDI_CONF_LISTENER | DAHDI_CONF_TALKER);
/* first put the channel on the conference in announce mode */
if (ioctl(myrpt->pchannel->fds[0],DAHDI_SETCONF,&ci) == -1)
{
@@ -4402,7 +4398,7 @@
ci.chan = 0;
ci.confno = myrpt->conf;
ci.confmode = ((myrpt->p.duplex == 2) || (myrpt->p.duplex == 4)) ? DAHDI_CONF_CONFANNMON :
- (DAHDI_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER);
+ (DAHDI_CONF_CONF | DAHDI_CONF_LISTENER | DAHDI_CONF_TALKER);
/* first put the channel on the conference in announce mode */
if (ioctl(myrpt->pchannel->fds[0],DAHDI_SETCONF,&ci) == -1)
{
@@ -4610,7 +4606,7 @@
/* make a conference for the tx */
ci.chan = 0;
ci.confno = myrpt->conf;
- ci.confmode = DAHDI_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER;
+ ci.confmode = DAHDI_CONF_CONF | DAHDI_CONF_LISTENER | DAHDI_CONF_TALKER;
/* first put the channel on the conference in proper mode */
if (ioctl(l->pchan->fds[0], DAHDI_SETCONF, &ci) == -1)
{
@@ -5847,9 +5843,9 @@
static void rbi_out(struct rpt *myrpt,unsigned char *data)
{
-struct zt_radio_param r;
-
- memset(&r,0,sizeof(struct zt_radio_param));
+struct dahdi_radio_param r;
+
+ memset(&r,0,sizeof(struct dahdi_radio_param));
r.radpar = DAHDI_RADPAR_REMMODE;
r.data = DAHDI_RADPAR_REM_RBI1;
/* if setparam ioctl fails, its probably not a pciradio card */
@@ -5871,7 +5867,7 @@
unsigned char *rxbuf, int rxmaxbytes, int asciiflag)
{
int i,j,index,oldmode,olddata;
- struct zt_radio_param prm;
+ struct dahdi_radio_param prm;
char c;
if(debug){
@@ -8963,7 +8959,7 @@
/* make a conference for the tx */
ci.chan = 0;
ci.confno = -1; /* make a new conf */
- ci.confmode = DAHDI_CONF_CONF | ZT_CONF_LISTENER;
+ ci.confmode = DAHDI_CONF_CONF | DAHDI_CONF_LISTENER;
/* first put the channel on the conference in proper mode */
if (ioctl(myrpt->zaptxchannel->fds[0],DAHDI_SETCONF,&ci) == -1)
{
@@ -8983,7 +8979,7 @@
ci.chan = 0;
ci.confno = -1; /* make a new conf */
ci.confmode = ((myrpt->p.duplex == 2) || (myrpt->p.duplex == 4)) ? DAHDI_CONF_CONFANNMON :
- (DAHDI_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER);
+ (DAHDI_CONF_CONF | DAHDI_CONF_LISTENER | DAHDI_CONF_TALKER);
/* first put the channel on the conference in announce mode */
if (ioctl(myrpt->pchannel->fds[0],DAHDI_SETCONF,&ci) == -1)
{
@@ -9057,7 +9053,7 @@
/* make a conference for the tx */
ci.chan = 0;
ci.confno = myrpt->txconf;
- ci.confmode = DAHDI_CONF_CONF | ZT_CONF_TALKER ;
+ ci.confmode = DAHDI_CONF_CONF | DAHDI_CONF_TALKER ;
/* first put the channel on the conference in proper mode */
if (ioctl(myrpt->txpchannel->fds[0],DAHDI_SETCONF,&ci) == -1)
{
@@ -10572,7 +10568,7 @@
DAHDI_PARAMS par;
int ms,elap,nullfd;
time_t t,last_timeout_warning;
- struct zt_radio_param z;
+ struct dahdi_radio_param z;
struct rpt_tele *telem;
nullfd = open("/dev/null",O_RDWR);
@@ -10948,7 +10944,7 @@
/* make a conference for the tx */
ci.chan = 0;
ci.confno = myrpt->conf;
- ci.confmode = DAHDI_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER;
+ ci.confmode = DAHDI_CONF_CONF | DAHDI_CONF_LISTENER | DAHDI_CONF_TALKER;
/* first put the channel on the conference in proper mode */
if (ioctl(l->pchan->fds[0],DAHDI_SETCONF,&ci) == -1)
{
Modified: branches/1.4/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=125132&r1=125131&r2=125132
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Wed Jun 25 17:21:30 2008
@@ -104,6 +104,7 @@
#define SMDI_MD_WAIT_TIMEOUT 1500 /* 1.5 seconds */
#include "asterisk/dahdi_compat.h"
+#include "asterisk/tonezone_compat.h"
/*! Global jitterbuffer configuration - by default, jb is disabled */
static struct ast_jb_conf default_jbconf =
Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=125132&r1=125131&r2=125132
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Wed Jun 25 17:21:30 2008
@@ -1360,8 +1360,14 @@
if test "${PBX_DAHDI}" = "1" || test "${USE_ZAPTEL}" = "no"; then
tonezone_dir="dahdi"
+ if test "x${DAHDI_DIR}" != "x"; then
+ tonezone_extra="${tonezone_extra} -I${DAHDI_DIR}/include"
+ fi
else
tonezone_dir="zaptel"
+ if test "x${ZAPTEL_DIR}" != "x"; then
+ tonezone_extra="${tonezone_extra} -I${ZAPTEL_DIR}/include"
+ fi
fi
AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [${tonezone_dir}/tonezone.h], [${tonezone_extra}])
Modified: branches/1.4/include/asterisk/dahdi_compat.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/dahdi_compat.h?view=diff&rev=125132&r1=125131&r2=125132
==============================================================================
--- branches/1.4/include/asterisk/dahdi_compat.h (original)
+++ branches/1.4/include/asterisk/dahdi_compat.h Wed Jun 25 17:21:30 2008
@@ -22,15 +22,13 @@
#ifndef DAHDI_COMPAT_H
#define DAHDI_COMPAT_H
-#ifdef HAVE_DAHDI
+#if defined(HAVE_DAHDI)
#include <dahdi/user.h>
-#include <dahdi/tonezone.h>
#elif defined(HAVE_ZAPTEL)
#include <zaptel/zaptel.h>
-#include <zaptel/tonezone.h>
/* Compiling against Zaptel instead of DAHDI */
Copied: branches/1.4/include/asterisk/tonezone_compat.h (from r125130, branches/1.4/include/asterisk/dahdi_compat.h)
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/tonezone_compat.h?view=diff&rev=125132&p1=branches/1.4/include/asterisk/dahdi_compat.h&r1=125130&p2=branches/1.4/include/asterisk/tonezone_compat.h&r2=125132
==============================================================================
--- branches/1.4/include/asterisk/dahdi_compat.h (original)
+++ branches/1.4/include/asterisk/tonezone_compat.h Wed Jun 25 17:21:30 2008
@@ -16,174 +16,20 @@
/*!
* \file
- * \brief DAHDI compatibility with zaptel
+ * \brief Find tonezone header in the right place (DAHDI or Zaptel)
*/
-#ifndef DAHDI_COMPAT_H
-#define DAHDI_COMPAT_H
+#ifndef TONEZONE_COMPAT_H
+#define TONEZONE_COMPAT_H
-#ifdef HAVE_DAHDI
+#if defined(HAVE_DAHDI)
-#include <dahdi/user.h>
#include <dahdi/tonezone.h>
#elif defined(HAVE_ZAPTEL)
-#include <zaptel/zaptel.h>
#include <zaptel/tonezone.h>
-
-/* Compiling against Zaptel instead of DAHDI */
-
-#define __DAHDI_SIG_FXO __ZT_SIG_FXO
-#define __DAHDI_SIG_FXS __ZT_SIG_FXS
-#define DAHDI_ALARM_BLUE ZT_ALARM_BLUE
-#define DAHDI_ALARM_LOOPBACK ZT_ALARM_LOOPBACK
-#define DAHDI_ALARM_NONE ZT_ALARM_NONE
-#define DAHDI_ALARM_NOTOPEN ZT_ALARM_NOTOPEN
-#define DAHDI_ALARM_RECOVER ZT_ALARM_RECOVER
-#define DAHDI_ALARM_RED ZT_ALARM_RED
-#define DAHDI_ALARM_YELLOW ZT_ALARM_YELLOW
-#define DAHDI_AUDIOMODE ZT_AUDIOMODE
-#define DAHDI_BUFFERINFO ZT_BUFFERINFO
-#define DAHDI_CHANNO ZT_CHANNO
-#define DAHDI_CHECK_HOOKSTATE ZT_CHECK_HOOKSTATE
-#define DAHDI_CONF_CONF ZT_CONF_CONF
-#define DAHDI_CONF_CONFANN ZT_CONF_CONFANN
-#define DAHDI_CONF_CONFANNMON ZT_CONF_CONFANNMON
-#define DAHDI_CONF_CONFMON ZT_CONF_CONFMON
-#define DAHDI_CONF_DIGITALMON ZT_CONF_DIGITALMON
-#define DAHDI_CONF_LISTENER ZT_CONF_LISTENER
-#define DAHDI_CONF_MONITORBOTH ZT_CONF_MONITORBOTH
-#define DAHDI_CONF_NORMAL ZT_CONF_NORMAL
-#define DAHDI_CONF_PSEUDO_LISTENER ZT_CONF_PSEUDO_LISTENER
-#define DAHDI_CONF_PSEUDO_TALKER ZT_CONF_PSEUDO_TALKER
-#define DAHDI_CONF_REALANDPSEUDO ZT_CONF_REALANDPSEUDO
-#define DAHDI_CONF_TALKER ZT_CONF_TALKER
-#define DAHDI_CONFDIAG ZT_CONFDIAG
-#define DAHDI_CONFINFO ZT_CONFINFO
-#define DAHDI_CONFMUTE ZT_CONFMUTE
-#define DAHDI_DEFAULT_NUM_BUFS ZT_DEFAULT_NUM_BUFS
-#define DAHDI_DIAL ZT_DIAL
-#define DAHDI_DIALING ZT_DIALING
-#define DAHDI_DIAL_OP_APPEND ZT_DIAL_OP_APPEND
-#define DAHDI_DIAL_OPERATION ZT_DIAL_OPERATION
-#define DAHDI_DIAL_OP_REPLACE ZT_DIAL_OP_REPLACE
-#define DAHDI_DIAL_PARAMS ZT_DIAL_PARAMS
-#define DAHDI_ECHOCANCEL ZT_ECHOCANCEL
-#define DAHDI_ECHOTRAIN ZT_ECHOTRAIN
-#define DAHDI_EVENT_ALARM ZT_EVENT_ALARM
-#define DAHDI_EVENT_BITSCHANGED ZT_EVENT_BITSCHANGED
-#define DAHDI_EVENT_DIALCOMPLETE ZT_EVENT_DIALCOMPLETE
-#define DAHDI_EVENT_DTMFDOWN ZT_EVENT_DTMFDOWN
-#define DAHDI_EVENT_DTMFUP ZT_EVENT_DTMFUP
-#define DAHDI_EVENT_EC_DISABLED ZT_EVENT_EC_DISABLED
-#define DAHDI_EVENT_HOOKCOMPLETE ZT_EVENT_HOOKCOMPLETE
-#define DAHDI_EVENT_NOALARM ZT_EVENT_NOALARM
-#define DAHDI_EVENT_NONE ZT_EVENT_NONE
-#define DAHDI_EVENT_ONHOOK ZT_EVENT_ONHOOK
-#define DAHDI_EVENT_POLARITY ZT_EVENT_POLARITY
-#define DAHDI_EVENT_PULSEDIGIT ZT_EVENT_PULSEDIGIT
-#define DAHDI_EVENT_PULSE_START ZT_EVENT_PULSE_START
-#define DAHDI_EVENT_REMOVED ZT_EVENT_REMOVED
-#define DAHDI_EVENT_RINGBEGIN ZT_EVENT_RINGBEGIN
-#define DAHDI_EVENT_RINGEROFF ZT_EVENT_RINGEROFF
-#define DAHDI_EVENT_RINGERON ZT_EVENT_RINGERON
-#define DAHDI_EVENT_RINGOFFHOOK ZT_EVENT_RINGOFFHOOK
-#define DAHDI_EVENT_TIMER_EXPIRED ZT_EVENT_TIMER_EXPIRED
-#define DAHDI_EVENT_TIMER_PING ZT_EVENT_TIMER_PING
-#define DAHDI_EVENT_WINKFLASH ZT_EVENT_WINKFLASH
-#define DAHDI_FLASH ZT_FLASH
-#define DAHDI_FLUSH ZT_FLUSH
-#define DAHDI_FLUSH_ALL ZT_FLUSH_ALL
-#define DAHDI_FLUSH_BOTH ZT_FLUSH_BOTH
-#define DAHDI_FLUSH_READ ZT_FLUSH_READ
-#define DAHDI_FLUSH_WRITE ZT_FLUSH_WRITE
-#define DAHDI_GAINS ZT_GAINS
-#define DAHDI_GET_BUFINFO ZT_GET_BUFINFO
-#define DAHDI_GETCONF ZT_GETCONF
-#define DAHDI_GETCONFMUTE ZT_GETCONFMUTE
-#define DAHDI_GETEVENT ZT_GETEVENT
-#define DAHDI_GETGAINS ZT_GETGAINS
-#define DAHDI_GET_PARAMS ZT_GET_PARAMS
-#define DAHDI_HOOK ZT_HOOK
-#define DAHDI_IOMUX ZT_IOMUX
-#define DAHDI_IOMUX_READ ZT_IOMUX_READ
-#define DAHDI_IOMUX_SIGEVENT ZT_IOMUX_SIGEVENT
-#define DAHDI_IOMUX_WRITE ZT_IOMUX_WRITE
-#define DAHDI_LAW_ALAW ZT_LAW_ALAW
-#define DAHDI_LAW_DEFAULT ZT_LAW_DEFAULT
-#define DAHDI_LAW_MULAW ZT_LAW_MULAW
-#define DAHDI_MAX_NUM_BUFS ZT_MAX_NUM_BUFS
-#define DAHDI_MAX_SPANS ZT_MAX_SPANS
-#define DAHDI_OFFHOOK ZT_OFFHOOK
-#define DAHDI_ONHOOK ZT_ONHOOK
-#define DAHDI_ONHOOKTRANSFER ZT_ONHOOKTRANSFER
-#define DAHDI_PARAMS ZT_PARAMS
-#define DAHDI_POLICY_IMMEDIATE ZT_POLICY_IMMEDIATE
-#define DAHDI_PRI ZT_PRI
-#define DAHDI_RING ZT_RING
-#define DAHDI_RINGOFF ZT_RINGOFF
-#define DAHDI_SENDTONE ZT_SENDTONE
-#define DAHDI_SET_BLOCKSIZE ZT_SET_BLOCKSIZE
-#define DAHDI_SET_BUFINFO ZT_SET_BUFINFO
-#define DAHDI_SETCADENCE ZT_SETCADENCE
-#define DAHDI_SETCONF ZT_SETCONF
-#define DAHDI_SET_DIALPARAMS ZT_SET_DIALPARAMS
-#define DAHDI_SETGAINS ZT_SETGAINS
-#define DAHDI_SETLAW ZT_SETLAW
-#define DAHDI_SETLINEAR ZT_SETLINEAR
-#define DAHDI_SET_PARAMS ZT_SET_PARAMS
-#define DAHDI_SETTONEZONE ZT_SETTONEZONE
-#define DAHDI_SIG_CLEAR ZT_SIG_CLEAR
-#define DAHDI_SIG_EM ZT_SIG_EM
-#define DAHDI_SIG_EM_E1 ZT_SIG_EM_E1
-#define DAHDI_SIG_FXO ZT_SIG_FXO
-#define DAHDI_SIG_FXOGS ZT_SIG_FXOGS
-#define DAHDI_SIG_FXOKS ZT_SIG_FXOKS
-#define DAHDI_SIG_FXOLS ZT_SIG_FXOLS
-#define DAHDI_SIG_FXS ZT_SIG_FXS
-#define DAHDI_SIG_FXSGS ZT_SIG_FXSGS
-#define DAHDI_SIG_FXSKS ZT_SIG_FXSKS
-#define DAHDI_SIG_FXSLS ZT_SIG_FXSLS
-#define DAHDI_SIG_HARDHDLC ZT_SIG_HARDHDLC
-#define DAHDI_SIG_HDLCFCS ZT_SIG_HDLCFCS
-#define DAHDI_SIG_SF ZT_SIG_SF
-#define DAHDI_SPANINFO ZT_SPANINFO
-#define DAHDI_SPANSTAT ZT_SPANSTAT
-#define DAHDI_SPECIFY ZT_SPECIFY
-#define DAHDI_START ZT_START
-#define DAHDI_TCOP_ALLOCATE ZT_TCOP_ALLOCATE
-#define DAHDI_TCOP_GETINFO ZT_TCOP_GETINFO
-#define DAHDI_TCOP_RELEASE ZT_TCOP_RELEASE
-#define DAHDI_TCOP_TRANSCODE ZT_TCOP_TRANSCODE
-#define DAHDI_TIMERACK ZT_TIMERACK
-#define DAHDI_TIMERCONFIG ZT_TIMERCONFIG
-#define DAHDI_TIMERPING ZT_TIMERPING
-#define DAHDI_TIMERPONG ZT_TIMERPONG
-#define DAHDI_TONE_BUSY ZT_TONE_BUSY
-#define DAHDI_TONE_CONGESTION ZT_TONE_CONGESTION
-#define DAHDI_TONEDETECT ZT_TONEDETECT
-#define DAHDI_TONEDETECT_MUTE ZT_TONEDETECT_MUTE
-#define DAHDI_TONEDETECT_ON ZT_TONEDETECT_ON
-#define DAHDI_TONE_DIALRECALL ZT_TONE_DIALRECALL
-#define DAHDI_TONE_DIALTONE ZT_TONE_DIALTONE
-#define DAHDI_TONE_DTMF_A ZT_TONE_DTMF_A
-#define DAHDI_TONE_DTMF_BASE ZT_TONE_DTMF_BASE
-#define DAHDI_TONE_DTMF_p ZT_TONE_DTMF_p
-#define DAHDI_TONE_DTMF_s ZT_TONE_DTMF_s
-#define DAHDI_TONE_INFO ZT_TONE_INFO
-#define DAHDI_TONE_RINGTONE ZT_TONE_RINGTONE
-#define DAHDI_TONE_STUTTER ZT_TONE_STUTTER
-#define DAHDI_TRANSCODE_HEADER ZT_TRANSCODE_HEADER
-#define DAHDI_TRANSCODE_INFO ZT_TRANSCODE_INFO
-#define DAHDI_TRANSCODE_MAGIC ZT_TRANSCODE_MAGIC
-#define DAHDI_TRANSCODE_OP ZT_TRANSCODE_OP
-#define DAHDI_vldtmf ZT_vldtmf
-#define DAHDI_WINK ZT_WINK
-#define HAVE_DAHDI HAVE_ZAPTEL
-
-#define dahdi_ring_cadence zt_ring_cadence
#endif
-#endif /* DAHDI_COMPAT_H */
+#endif /* TONEZONE_COMPAT_H */
More information about the svn-commits
mailing list