[asterisk-commits] kpfleming: branch 1.6.0 r125146 - in /branches/1.6.0: ./ apps/ channels/ code...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jun 25 18:20:36 CDT 2008
Author: kpfleming
Date: Wed Jun 25 18:20:35 2008
New Revision: 125146
URL: http://svn.digium.com/view/asterisk?view=rev&rev=125146
Log:
Merged revisions 125138 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r125138 | kpfleming | 2008-06-25 18:05:28 -0500 (Wed, 25 Jun 2008) | 18 lines
Merged revisions 125132 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r125132 | kpfleming | 2008-06-25 17:21:30 -0500 (Wed, 25 Jun 2008) | 10 lines
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
........
................
Removed:
branches/1.6.0/include/asterisk/dahdi.h
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/apps/app_dahdiras.c
branches/1.6.0/apps/app_dahdiscan.c
branches/1.6.0/apps/app_flash.c
branches/1.6.0/apps/app_meetme.c
branches/1.6.0/apps/app_rpt.c
branches/1.6.0/channels/chan_dahdi.c
branches/1.6.0/channels/chan_iax2.c
branches/1.6.0/codecs/codec_dahdi.c
branches/1.6.0/configure
branches/1.6.0/configure.ac
branches/1.6.0/main/Makefile
branches/1.6.0/main/asterisk.c
branches/1.6.0/main/channel.c
branches/1.6.0/res/res_musiconhold.c
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/apps/app_dahdiras.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_dahdiras.c?view=diff&rev=125146&r1=125145&r2=125146
==============================================================================
--- branches/1.6.0/apps/app_dahdiras.c (original)
+++ branches/1.6.0/apps/app_dahdiras.c Wed Jun 25 18:20:35 2008
@@ -43,7 +43,7 @@
#include <fcntl.h>
-#include "asterisk/dahdi.h"
+#include <dahdi/user.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
Modified: branches/1.6.0/apps/app_dahdiscan.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_dahdiscan.c?view=diff&rev=125146&r1=125145&r2=125146
==============================================================================
--- branches/1.6.0/apps/app_dahdiscan.c (original)
+++ branches/1.6.0/apps/app_dahdiscan.c Wed Jun 25 18:20:35 2008
@@ -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"
Modified: branches/1.6.0/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_flash.c?view=diff&rev=125146&r1=125145&r2=125146
==============================================================================
--- branches/1.6.0/apps/app_flash.c (original)
+++ branches/1.6.0/apps/app_flash.c Wed Jun 25 18:20:35 2008
@@ -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"
Modified: branches/1.6.0/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_meetme.c?view=diff&rev=125146&r1=125145&r2=125146
==============================================================================
--- branches/1.6.0/apps/app_meetme.c (original)
+++ branches/1.6.0/apps/app_meetme.c Wed Jun 25 18:20:35 2008
@@ -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 @@
"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"
Modified: branches/1.6.0/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_rpt.c?view=diff&rev=125146&r1=125145&r2=125146
==============================================================================
--- branches/1.6.0/apps/app_rpt.c (original)
+++ branches/1.6.0/apps/app_rpt.c Wed Jun 25 18:20:35 2008
@@ -218,6 +218,8 @@
#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>
@@ -235,8 +237,6 @@
#include "asterisk/say.h"
#include "asterisk/localtime.h"
#include "asterisk/app.h"
-
-#include "asterisk/dahdi.h"
static char *app = "Rpt";
Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=125146&r1=125145&r2=125146
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Wed Jun 25 18:20:35 2008
@@ -58,7 +58,9 @@
#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>
@@ -123,16 +125,6 @@
.impl = ""
};
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
Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=125146&r1=125145&r2=125146
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Wed Jun 25 18:20:35 2008
@@ -52,8 +52,9 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <regex.h>
-
-#include "asterisk/dahdi.h"
+#include <sys/ioctl.h>
+#include <dahdi/user.h>
+
#include "asterisk/paths.h" /* need ast_config_AST_DATA_DIR for firmware */
#include "asterisk/lock.h"
Modified: branches/1.6.0/codecs/codec_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/codecs/codec_dahdi.c?view=diff&rev=125146&r1=125145&r2=125146
==============================================================================
--- branches/1.6.0/codecs/codec_dahdi.c (original)
+++ branches/1.6.0/codecs/codec_dahdi.c Wed Jun 25 18:20:35 2008
@@ -39,7 +39,8 @@
#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"
Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=125146&r1=125145&r2=125146
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Wed Jun 25 18:20:35 2008
@@ -1419,7 +1419,10 @@
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], [])
Modified: branches/1.6.0/main/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/Makefile?view=diff&rev=125146&r1=125145&r2=125146
==============================================================================
--- branches/1.6.0/main/Makefile (original)
+++ branches/1.6.0/main/Makefile Wed Jun 25 18:20:35 2008
@@ -130,8 +130,8 @@
$(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)),)
Modified: branches/1.6.0/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/asterisk.c?view=diff&rev=125146&r1=125145&r2=125146
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Wed Jun 25 18:20:35 2008
@@ -86,7 +86,8 @@
#include <sys/loadavg.h>
#endif
-#include "asterisk/dahdi.h"
+#include <sys/ioctl.h>
+#include <dahdi/user.h>
#ifdef linux
#include <sys/prctl.h>
Modified: branches/1.6.0/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=125146&r1=125145&r2=125146
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Wed Jun 25 18:20:35 2008
@@ -32,9 +32,10 @@
#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"
Modified: branches/1.6.0/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_musiconhold.c?view=diff&rev=125146&r1=125145&r2=125146
==============================================================================
--- branches/1.6.0/res/res_musiconhold.c (original)
+++ branches/1.6.0/res/res_musiconhold.c Wed Jun 25 18:20:35 2008
@@ -46,7 +46,7 @@
#include <thread.h>
#endif
-#include "asterisk/dahdi.h"
+#include <dahdi/user.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
More information about the asterisk-commits
mailing list