diff options
| -rw-r--r-- | apps/app_dahdiras.c | 2 | ||||
| -rw-r--r-- | apps/app_dahdiscan.c | 3 | ||||
| -rw-r--r-- | apps/app_flash.c | 3 | ||||
| -rw-r--r-- | apps/app_meetme.c | 5 | ||||
| -rw-r--r-- | apps/app_rpt.c | 4 | ||||
| -rw-r--r-- | channels/chan_dahdi.c | 14 | ||||
| -rw-r--r-- | channels/chan_iax2.c | 3 | ||||
| -rw-r--r-- | codecs/codec_dahdi.c | 3 | ||||
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | include/asterisk/dahdi.h | 42 | ||||
| -rw-r--r-- | main/Makefile | 4 | ||||
| -rw-r--r-- | main/asterisk.c | 3 | ||||
| -rw-r--r-- | main/channel.c | 3 | ||||
| -rw-r--r-- | res/res_musiconhold.c | 2 |
15 files changed, 33 insertions, 70 deletions
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c index 979724789..6038c524f 100644 --- a/apps/app_dahdiras.c +++ b/apps/app_dahdiras.c @@ -43,7 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <fcntl.h> -#include "asterisk/dahdi.h" +#include <dahdi/user.h> #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/apps/app_dahdiscan.c b/apps/app_dahdiscan.c index d7b100eac..57cc231f3 100644 --- a/apps/app_dahdiscan.c +++ b/apps/app_dahdiscan.c @@ -38,7 +38,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include "asterisk/dahdi.h" +#include <sys/ioctl.h> +#include <dahdi/user.h> #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/apps/app_flash.c b/apps/app_flash.c index dd13f414f..5e5b6b132 100644 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -33,7 +33,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include "asterisk/dahdi.h" +#include <sys/ioctl.h> +#include <dahdi/user.h> #include "asterisk/lock.h" #include "asterisk/file.h" diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 1dc33bd0f..6ab05e2fd 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -37,7 +37,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include "asterisk/dahdi.h" +#include <sys/ioctl.h> +#include <dahdi/user.h> #include "asterisk/lock.h" #include "asterisk/file.h" @@ -293,7 +294,7 @@ static const char *descrip2 = "will be returned in the variable. Upon app completion, MeetMeCount will hangup\n" "the channel, unless priority n+1 exists, in which case priority progress will\n" "continue.\n" -"A ZAPTEL INTERFACE MUST BE INSTALLED FOR CONFERENCING FUNCTIONALITY.\n"; +""; static const char *descrip3 = " MeetMeAdmin(confno,command[,user]): Run admin command for conference\n" diff --git a/apps/app_rpt.c b/apps/app_rpt.c index d45104ec1..40ce3492f 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -218,6 +218,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/ioctl.h> #include <sys/io.h> #include <math.h> +#include <dahdi/user.h> +#include <dahdi/tonezone.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -236,8 +238,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/localtime.h" #include "asterisk/app.h" -#include "asterisk/dahdi.h" - static char *app = "Rpt"; static char *synopsis = "Radio Repeater/Remote Base Control System"; diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 86f13b527..5165fb522 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -58,7 +58,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/ioctl.h> #include <math.h> #include <ctype.h> -#include "asterisk/dahdi.h" + +#include <dahdi/user.h> +#include <dahdi/tonezone.h> #ifdef HAVE_PRI #include <libpri.h> @@ -124,16 +126,6 @@ static struct ast_jb_conf default_jbconf = }; static struct ast_jb_conf global_jbconf; -#if !defined(DAHDI_SIG_EM_E1) || (defined(HAVE_PRI) && !defined(DAHDI_SIG_HARDHDLC)) -#error "Your DAHDI is too old. Please update" -#endif - -#ifndef DAHDI_TONEDETECT -/* Work around older code with no tone detect */ -#define DAHDI_EVENT_DTMFDOWN 0 -#define DAHDI_EVENT_DTMFUP 0 -#endif - /* define this to send PRI user-user information elements */ #undef SUPPORT_USERUSER diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 90a1961b5..92d14d188 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -52,8 +52,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <fcntl.h> #include <sys/stat.h> #include <regex.h> +#include <sys/ioctl.h> +#include <dahdi/user.h> -#include "asterisk/dahdi.h" #include "asterisk/paths.h" /* need ast_config_AST_DATA_DIR for firmware */ #include "asterisk/lock.h" diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c index 61dc9d43b..76661e6c4 100644 --- a/codecs/codec_dahdi.c +++ b/codecs/codec_dahdi.c @@ -39,7 +39,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/ioctl.h> #include <sys/mman.h> -#include "asterisk/dahdi.h" +#include <dahdi/user.h> + #include "asterisk/lock.h" #include "asterisk/translate.h" #include "asterisk/config.h" @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 119800 . +# From configure.ac Revision: 123332 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -45174,7 +45174,10 @@ if test "${host_os}" != "linux-gnu" ; then tonezone_extra="-lm" fi -# new tonezone, version 1.4.0 +if test "x${DAHDI_DIR}" != "x"; then + tonezone_extra="${tonezone_extra} -I${DAHDI_DIR}/include" +fi + if test "x${PBX_TONEZONE}" != "x1" -a "${USE_TONEZONE}" != "no"; then pbxlibdir="" diff --git a/configure.ac b/configure.ac index f417ace05..514b07ada 100644 --- a/configure.ac +++ b/configure.ac @@ -1419,7 +1419,10 @@ if test "${host_os}" != "linux-gnu" ; then tonezone_extra="-lm" fi -# new tonezone, version 1.4.0 +if test "x${DAHDI_DIR}" != "x"; then + tonezone_extra="${tonezone_extra} -I${DAHDI_DIR}/include" +fi + AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_find], [dahdi/tonezone.h], [${tonezone_extra}]) AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], []) diff --git a/include/asterisk/dahdi.h b/include/asterisk/dahdi.h deleted file mode 100644 index 0a37b891d..000000000 --- a/include/asterisk/dahdi.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Asterisk -- An open source telephony toolkit. - * - * Copyright (C) 2007, Digium, Inc. - * - * See http://www.asterisk.org for more information about - * the Asterisk project. Please do not directly contact - * any of the maintainers of this project for assistance; - * the project provides a web site, mailing lists and IRC - * channels for your use. - * - * This program is free software, distributed under the terms of - * the GNU General Public License Version 2. See the LICENSE file - * at the top of the source tree. - * - * Sometimes one really wonders why we need a copyright - * for less than ten lines of preprocessor directives... - */ - -/*! \file - * \brief Stub to find DAHDI headers -* - * Stub to find the DAHDI headers. The configure script will - * define HAVE_DAHDI_VERSION according to what it has found. - * Applications should include "user.h" and not (directly) - * <foo/user.h> - * For the mapping of version numbers to location see below. - * - */ -#ifndef _AST_DAHDI_H -#define _AST_DAHDI_H - -#ifdef HAVE_DAHDI -#include <sys/ioctl.h> - -/* newer versions install in ${PREFIX}/dahdi */ -#include <dahdi/user.h> -#include <dahdi/tonezone.h> - -#endif /* HAVE_DAHDI */ - -#endif /* _AST_DAHDI_H */ diff --git a/main/Makefile b/main/Makefile index 4dd425773..266f78c12 100644 --- a/main/Makefile +++ b/main/Makefile @@ -130,8 +130,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h $(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm rm ast_expr2.o ast_expr2f.o -channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) -asterisk.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE) +channel.o: ASTCFLAGS+=$(DAHDI_INCLUDE) +asterisk.o: ASTCFLAGS+=$(DAHDI_INCLUDE) ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) diff --git a/main/asterisk.c b/main/asterisk.c index 367044858..e086c0673 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -86,7 +86,8 @@ int daemon(int, int); /* defined in libresolv of all places */ #include <sys/loadavg.h> #endif -#include "asterisk/dahdi.h" +#include <sys/ioctl.h> +#include <dahdi/user.h> #ifdef linux #include <sys/prctl.h> diff --git a/main/channel.c b/main/channel.c index 07b0fb4b2..513565014 100644 --- a/main/channel.c +++ b/main/channel.c @@ -32,9 +32,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/time.h> #include <signal.h> #include <math.h> +#include <sys/ioctl.h> +#include <dahdi/user.h> #include "asterisk/paths.h" /* use ast_config_AST_SYSTEM_NAME */ -#include "asterisk/dahdi.h" #include "asterisk/pbx.h" #include "asterisk/frame.h" diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 79f9de8f7..7ab2c9109 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -46,7 +46,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <thread.h> #endif -#include "asterisk/dahdi.h" +#include <dahdi/user.h> #include "asterisk/lock.h" #include "asterisk/file.h" |